am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and...
am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit 'b1ca2a0c':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]