tree d1a69db95633cc0554b9e8b5f4eabfab71173a9b
parent a7f2dd4b8892a97edbe90470dcd20504d4131e5f
parent 2d709514bce280f68cefa9691d7ef72acaddf419
author Baligh Uddin <baligh@google.com> 1383666995 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383666995 -0800

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

* commit '2d709514bce280f68cefa9691d7ef72acaddf419':
  Import translations. DO NOT MERGE