tree a958ae0c9a933e35aa225587f55618ea03267e6c
parent cc93360812c822eb4cac8056a0848c74338b3776
parent 91bceebd0bb15a5d20d43f8eca808114b96eb5ce
author Baligh Uddin <baligh@google.com> 1413757026 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757026 +0000

am 91bceebd: (-s ours) Import translations. DO NOT MERGE

* commit '91bceebd0bb15a5d20d43f8eca808114b96eb5ce':
  Import translations. DO NOT MERGE