tree 7c206fb35049fb5be574c5058524033d673b9ff8
parent 940bbf1c54c04fa68a2573715d13fb99a6bd8154
parent e699d8bfa7f114500bafff9f05edd3485996d8f6
author Baligh Uddin <baligh@google.com> 1367873766 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367873766 -0700

am e699d8bf: (-s ours) am 5c68e5f0: Import translations. DO NOT MERGE

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