Merge ""Two actions ought to be enough for anybody."" into jb-dev

Author: dsandler

core/java/android/app/Notification.java

@@ -911,7 +911,7 @@ public String toString() {
      * </pre>
      */
     public static class Builder {
-        private static final int MAX_ACTION_BUTTONS = 2;
+        private static final int MAX_ACTION_BUTTONS = 3;
 
         private Context mContext;