Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
tree: 9c0b5260c3a4b506b404aa890e5b72b08d99a20a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS