am c9cdd2c1: (-s ours) 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 'c9cdd2c1324163e22cdab7dcd1fc8cc5c27a9177':
  DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.
tree: 9f6248773dcf7d820ec42b83c628dfb37393c6e5
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags