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

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