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

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