Merge "DO NOT MERGE - Merge ab/7272582"
tree: 163920c8e35f050784eb2dca9cebe0c9983c5ebb
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties