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

Change-Id: I9051cf41c82326a1d6aec0fbb4a9f5f5bc1acf72
tree: 34e0d76dc9492799aee82300fea7447ef4bdc59a
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml