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

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