Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c527941449  -s ours
am: 51df670652  -s ours

Change-Id: I472ecff59c06ee733f639c292e8d44439678b4d2
tree: f72a6716927abe7501ffc91c075ddcbfd7f93512
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags