tree 87592a72c56b10752f471ab91c8fa1a5d2a8632d
parent 079fe0fba31b0781eca73db934dfe2290fea3891
parent 68e70f9b144f474b3d63e1fbb04711a9e6bc9d19
author Baligh Uddin <baligh@google.com> 1380827925 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380827925 -0700

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

* commit '68e70f9b144f474b3d63e1fbb04711a9e6bc9d19':
  Import translations. DO NOT MERGE