Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: db89342ec6  -s ours

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