tree 4f17d9329b6dccf2976cd81880c5fed07819af43
parent 569ae3921d8945da9d48858771158e4f80232d9e
parent 78c7429c2c272084b1753d51911c70f773d3b3e7
author Baligh Uddin <baligh@google.com> 1392411182 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411182 +0000

am 78c7429c: (-s ours) am 0cc0c216: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '78c7429c2c272084b1753d51911c70f773d3b3e7':
  Import translations. DO NOT MERGE