Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d33e35be79 -s ours" into main
tree: 0c420367c1dbf37742c75684bbdd1e07458f33d4
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties