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

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