tree d8d2a645079e7e380315ac3c207fbaa967c7340b
parent 30728acaf53baf154f2d709e60686cfa58e5f99d
parent 478e318362e564c7a06dd3d16f315a4c5753ea45
author Baligh Uddin <baligh@google.com> 1386866893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386866893 +0000

am 478e3183: (-s ours) am 63f898ac: (-s ours) am 299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '478e318362e564c7a06dd3d16f315a4c5753ea45':
  Import translations. DO NOT MERGE