am d35644e4: (-s ours) am 15ecba0f: (-s ours) Import translations. DO NOT MERGE

* commit 'd35644e4f80a479659fd734db866a95c247496e3':
  Import translations. DO NOT MERGE
tree: cc82e3c2522e0f96faed36e708891e8fc495ce8e
  1. java/
  2. res/
  3. tests/
  4. Android.mk