tree f8d4c47ceeee50d33fc48df1436cf46d31575fb1
parent dbb5a3a745af4b9f27b3aad76b3cb1c1052dfddc
parent 67b404d688e8da44d104d54c78a8e37f88a4529b
author Baligh Uddin <baligh@google.com> 1413757015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757015 +0000

am 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '67b404d688e8da44d104d54c78a8e37f88a4529b':
  Import translations. DO NOT MERGE