[automerger skipped] Import translations. DO NOT MERGE
am: 6b2c43a4af  -s ours

Change-Id: Iee8a88472a56993bf272ab37fd5e33823484cc83
tree: eef01f893ea188e9425a47cf5a9be46e541421bf
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags