Merge \"Import translations. DO NOT MERGE am: cdd4f84e06  -s ours am: f3b6338d0f  -s ours\" into nyc-mr1-dev-plus-aosp
am: 5ff22074ac  -s ours

Change-Id: I5a5f63275aba246913eb87fcf6acd1e3be1c048e
tree: 1260b6d1fb43c035dca3e2e642110b2ea2ffd442
  1. jni/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags