Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: f89e8ca407
am: 57082627b3

Change-Id: Ie06ac3a9e7255835b0a7a77ddef6244d46bbe1c2
tree: 836bc428037a415f1ac176d2944f635ae9aecad4
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.cfg