Merge "More test-related changes" into lmp-mr1-dev
tree: c1c24dc244abef82fe7f5b6b9581ff65e76d2652
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags