am 156b98b6: (-s ours) am c522f9f3: Import translations. DO NOT MERGE

* commit '156b98b63439db17cbfed90577eae870e69cf95f':
  Import translations. DO NOT MERGE
tree: 5b6460a89c3c0b03899214b5f315dd73a644b184
  1. java/
  2. res/
  3. tests/
  4. Android.mk