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

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