tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent da38055ab3b1492c030c4cff96ecb91d78749896
parent 88b88fc5c357ffb6b5af77c6fc22ec46d1bf1130
author Baligh Uddin <baligh@google.com> 1392410132 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410132 +0000

am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '88b88fc5c357ffb6b5af77c6fc22ec46d1bf1130':
  Import translations. DO NOT MERGE