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

Change-Id: I7e0f8f1466aa9dbad584f709a9d93b0f3c1d8880
tree: 9188bcce82c3b70d637dce251c656000725f7e2b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags