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

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