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

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