am 3e7f6ebf: (-s ours) am 043e4298: (-s ours) am 2fae369f: (-s ours) Import translations. DO NOT MERGE
automerge: a2f6f22  -s ours

* commit 'a2f6f22f89646d534783c1a778eea074cb011621':
  Import translations. DO NOT MERGE
tree: 4bb2a1cc785ac261275fb49738d965049cd3ff9b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml