Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: a1f25b45e3 am: 7179d1b4b6 am: 6b48222adc
am: 792e6e53b5

Change-Id: I683c0ca03f170187bec90f805622858b9b65b393
tree: 135f5b9d6878f64ee1575c5ce78c8330f1f9438f
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE