am 6cf50e98: Merge "Fix problem where swiping upward in overflow menu did not display the correct options menu items."

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