am 5232126d: (-s ours) am f355990d: 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 '5232126d5e46260e977fdb7403e64d341b2e62c4':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags