Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3da1daf1 -s ours am: c01e675480 -s ours" into udc-d1-dev-plus-aosp
tree: 11a227cb69e696eaa0a0b8adae487f4555840df3
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS