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

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