am f93220c3: Merge "More test-related changes" into lmp-mr1-dev

* commit 'f93220c3163a1878e95167753a262cf3ee1ddf9d':
  More test-related changes
tree: f4ab719c478c6273e5b62da3b0906ef6ce1664f2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags