tree a1f5ecbaccc06dc611ab3bd635360d85ec018d2b
parent e98e7dbc9ad4d479c9d400f6260e00c5d6a35c3e
parent 3715fb1f98ac84d0cb3f3211cfc5d3e6b051f6a4
author Baligh Uddin <baligh@google.com> 1384404898 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384404898 -0800

am 3715fb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '3715fb1f98ac84d0cb3f3211cfc5d3e6b051f6a4':
  Import translations. DO NOT MERGE