Merge "Stop statically including legacy-android-test"
tree: be022fa4f5add380cfd9a4a855eb45c4587fd536
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags