am d26ab23b: (-s ours) am 5cd8ccf4: 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 'd26ab23bff9f6f3b66a420b4a1579654e388d489':
tree: c2175942e3a631ad112fe6ab17da560c45fc1ae2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags