Merge "Fix the tests that interact with the menu" into oc-dev
tree: 852688ec0b34d48cb6f808c5eb9d2e5790e820c9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml