tree aba178e6e512eb92550ade679f13172d78abd88c
parent 7e21c2eacb327373a4b58ad6503f53b0828854c6
parent 0e3b0e899fdf0ca2fe2e87ae701ebce6183b42ae
author Baligh Uddin <baligh@google.com> 1376943187 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376943187 -0700

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

* commit '0e3b0e899fdf0ca2fe2e87ae701ebce6183b42ae':
  Import translations. DO NOT MERGE