Merge "Fix problem where swiping upward in overflow menu did not display the correct options menu items."
tree: 167d7042a59d0c50627e04a3c03d8ece70c3a55d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags