am 4b02d399: (-s ours) am f650cef9: (-s ours) Import translations. DO NOT MERGE

* commit '4b02d39933c743695bd875782e4d052988ab0171':
tree: fbbf1af8b3273ee69e60750c87c447c0c013dd1e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags