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

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