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

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