Merge "Follow up on build break to fix unit tests." into klp-dev
tree: 409188c7460355143b2f31c676d3d30f136d12c7
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags