am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev

* commit '7d2e8960d0fcebf924c60dbd0f6934368ceb80e3':
  "Two actions ought to be enough for anybody."

core/java/android/app/Notification.java

@@ -911,7 +911,7 @@ public class Notification implements Parcelable
      * </pre>
      */
     public static class Builder {
-        private static final int MAX_ACTION_BUTTONS = 2;
+        private static final int MAX_ACTION_BUTTONS = 3;
 
         private Context mContext;