tree 0d7dc62f4aee70f7ee486b811a834d8539de6901
parent d9ede6ff02a04ee4ab5754a74dafe04ad5810b8f
parent 38551b3bb10a24e8949d776df2d44cd6c7f4f8e7
author Geoff Mendal <mendal@google.com> 1422285565 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422285565 +0000

am 38551b3b: (-s ours) Import translations. DO NOT MERGE

* commit '38551b3bb10a24e8949d776df2d44cd6c7f4f8e7':
  Import translations. DO NOT MERGE