Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6ecc274e5 -s ours am: f2fe4db511 -s ours am: d52692a1c2 -s ours" into tm-d1-dev-plus-aosp
tree: 1664b2924e4da9b8c639ec84eab20bc68569e38e
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties