tree 786c3c4f6a75a9489d11bd768240473a8ef74d11
parent c685fff9b76dd32fca96ec3a87b6c4075c668404
parent ed61958a254deb6299b907ecb079ebe15da339c3
author Baligh Uddin <baligh@google.com> 1404343162 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404343162 +0000

am ed61958a: (-s ours) am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'ed61958a254deb6299b907ecb079ebe15da339c3':
  Import translations. DO NOT MERGE