Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 3d154e274f

Change-Id: I5b99f148a1be95cbac7d47156881a06c6e5237be
tree: fe2c5992a80fd9ed4d5bb0bf107d497f5e733bab
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS