[automerger skipped] Merge "Import translations. DO NOT MERGE" am: b2dffcd51a -s ours
am skip reason: subject contains skip directive

Change-Id: Idc4f02f1772ba3c62a9f2115e73d59a83ea15549
tree: da0f101cd5d662f5739345915fc5f9011b7e082b
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.bp
  7. AndroidManifest.xml
  8. OWNERS