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

* commit '7c67081a6d0b14a215a6e3fda73593717eb90f34':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags