Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 0c1f4c2931  -s ours

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