tree b9221af250cffb377475a64263ff9a9a5f4379e1
parent 0d7ed5fc5f524e966dcc9060ea7b4eff0e57469c
parent 6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959
author Baligh Uddin <baligh@google.com> 1392411278 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411278 +0000

am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959':
  Import translations. DO NOT MERGE