tree 182b3ede157dd1bce6bff1954dd691e50f3878b9
parent 7bc7f2724848e4cefb2cd8b9a36ebe6d51c8414b
parent 235b63e98f96d16361f39850a5a789c13b0cbc39
author Baligh Uddin <baligh@google.com> 1379188470 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379188470 -0700

am e7fec206: (-s ours) am 780ac803: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e7fec206446c797e0229bb72246afa374c130903':
  Import translations. DO NOT MERGE