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

* commit 'a726e23d7b13824ede2cdc185ce846238d348604':
  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;