am 85b730dd: (-s ours) am 67d82f17: Import translations. DO NOT MERGE

* commit '85b730dd995fe4d633d86c3e186df792043657fb':
  Import translations. DO NOT MERGE
tree: 5fff4da0e30f67b6075ee849010c05d6e6e9bbfb
  1. java/
  2. res/
  3. tests/
  4. Android.mk