tree 8924d31ff2ecb8b544ab35dab62f515aac397156
parent 206f7a286df33a81fee79906d8903218c213df7e
parent d022ce93d3001d03b62dd7f4e0d7209d298c2124
author Baligh Uddin <baligh@google.com> 1443030126 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443030126 +0000

am d022ce93: (-s ours) am 269d8cc7: (-s ours) Import translations. DO NOT MERGE

* commit 'd022ce93d3001d03b62dd7f4e0d7209d298c2124':
  Import translations. DO NOT MERGE