Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
tree: bdff309df95d43195f24b6a8673184f4d4092550
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.cfg