tree cb963778923ae1e29c629bdf8d9bf3524aa72dc3
parent e54b83b0eec55e649d9308169902865991d6827a
parent db0f02cba92f7296e90d1ed9ed07d266c99ca96a
author Baligh Uddin <baligh@google.com> 1379215936 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379215936 -0700

am db0f02cb: (-s ours) am 75d888b1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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