tree 52ce1845696e788825e05127a459d7370e0efdfe
parent 476a40e33243c7c86859aa7fbadb8f24c0c32d3b
parent 87bcd150a4122b78e98d3b859869b54e4546405d
author Baligh Uddin <baligh@google.com> 1404671597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404671597 +0000

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

* commit '87bcd150a4122b78e98d3b859869b54e4546405d':
  Import translations. DO NOT MERGE