tree d8d2a645079e7e380315ac3c207fbaa967c7340b
parent e6e6936036a540b39dab6bcf8bdbfc294969f845
parent 36f05fbe454b0d349a054091fcd7b51325ad2bc1
author Baligh Uddin <baligh@google.com> 1392930939 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392930939 +0000

am 36f05fbe: (-s ours) am 09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '36f05fbe454b0d349a054091fcd7b51325ad2bc1':
  Import translations. DO NOT MERGE