am 444cfbbd: (-s ours) am 3973bc2d: (-s ours) Merge "Import translations. DO NOT MERGE"

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