Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: baedc65a8b  -s ours

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