tree 7e05b1109e8e19a336d77a36676eb1b03492a61f
parent cf210fd6da798d18bf9f9efd2f773cbf329a086b
parent 366822da664effffa479561433b8d78d211c5211
author Baligh Uddin <baligh@google.com> 1394144159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394144159 +0000

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

* commit '366822da664effffa479561433b8d78d211c5211':
  Import translations. DO NOT MERGE