tree 8067cb3e804339e5cb879e880284817a449f831d
parent 3abd1490404d2971ccd06924bbc658de5a094caa
parent 61365506c17bd9675b31de94a1ed2a2582c232f5
author Baligh Uddin <baligh@google.com> 1394145933 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394145933 +0000

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

* commit '61365506c17bd9675b31de94a1ed2a2582c232f5':
  Import translations. DO NOT MERGE