tree 3f1514789928e892320fa9cc988d6329507a3387
parent f68718190bdf631a13ec32bcda25523acafe522a
parent 54a973981115c8af2c96fab24e6520c39b9972ab
author Baligh Uddin <baligh@google.com> 1376952748 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376952748 -0700

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

* commit '54a973981115c8af2c96fab24e6520c39b9972ab':
  Import translations. DO NOT MERGE