am b0a7b3e9: (-s ours) am 619f4ace: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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