Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"
tree: 1a3be60512ea00d2ee2bb68501b637140d7cc686
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/