am aace94af: DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.

* commit 'aace94afdd4308cb38f4cc2b0c0374fa7377fe09':
  DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.
tree: ff0bcaaffb8bf8826fa625fc3af96f058c259d1f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags