Merge "Import translations. DO NOT MERGE" into nyc-dev
tree: e3c4649b15260137ad5a61d97bf24a41b4e7b2fc
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml