Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 59522001f5

Change-Id: I21a3bb7b49f10fa9d0e95fad2806d33cad5f7413
tree: 1baa232cc6c4333f68e40e2e30bc86a8c930645d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags