tree 52ce1845696e788825e05127a459d7370e0efdfe
parent 03c248aadece8459d2568dd8721d46cf748c7a56
parent 6e90b3c078baa2b6c6398376490b7c540309be70
author Baligh Uddin <baligh@google.com> 1404671584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404671584 +0000

am 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '6e90b3c078baa2b6c6398376490b7c540309be70':
  Import translations. DO NOT MERGE