tree 52ce1845696e788825e05127a459d7370e0efdfe
parent 861beac4f3c04850a8f99fca0bafb002a5ddecdf
parent ab157d740ed5c0bff544adc8992d9fce99462707
author Baligh Uddin <baligh@google.com> 1404671601 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404671601 +0000

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

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