tree 52ce1845696e788825e05127a459d7370e0efdfe
parent 9c9223d91eb57ba7f45532e551861696c55883ec
parent 8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8
author Baligh Uddin <baligh@google.com> 1404671968 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404671968 +0000

am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8':
  Import translations. DO NOT MERGE