tree e198352c12b2dffab88b123321bef5b4f73ec851
parent 58e99f564d552984d5088969a2aa827812db10ac
parent 852750b321c8f23c0b776a193a65d8f78afcf22b
author Baligh Uddin <baligh@google.com> 1395961501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395961501 +0000

am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '852750b321c8f23c0b776a193a65d8f78afcf22b':
  Import translations. DO NOT MERGE