Merge "Fix the tests that interact with the menu" into oc-dev
am: 3e231a5e46

Change-Id: I1da23710e9c3e1adcb2c2c7eb95ba25fc8e68504
tree: 3dcd1b80bbe67108becb03660a3b08987c224113
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml