am 8cb6d570: (-s ours) am d103d8b2: (-s ours) am f19c50fc: am aace94af: DO NOT MERGE. Fix problem where swiping upward in overflow menu did not display the correct options menu items.

* commit '8cb6d570c4565589224404053d64174b5425eafc':
tree: af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags