Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb0abc14b3 -s ours am: 1b02d99120 -s ours am: be03c87cb3 -s ours am: b8bf570978 -s ours"
tree: 14bce4b768a4a6a1cabb6b95accb028620205a51
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties