am d849afb1: am a726e23d: Merge "Cannot force a shown item from an ActionMode into the overflow menu." into jb-mr1-dev

* commit 'd849afb172e9e82a6814baa5c6d2fdcb8cf7736b':
  Cannot force a shown item from an ActionMode into the overflow menu.

core/java/com/android/internal/view/menu/ActionMenuPresenter.java

@@ -476,6 +476,9 @@ public class ActionMenuPresenter extends BaseMenuPresenter
                 if (isAction) maxActions--;
 
                 item.setIsActionButton(isAction);
+            } else {
+                // Neither requires nor requests an action button.
+                item.setIsActionButton(false);
             }
         }
         return true;