tree ba826422983b739fb75285ffe93b26077a40c8c0
parent 6cc163288e6cf213ca4b29a8afe8def0c0a9f11d
parent 6e5e3e5ab1bab262b7af03b0897a9ce5d2b55a67
author Baligh Uddin <baligh@google.com> 1414566022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566022 +0000

am 6e5e3e5a: (-s ours) am 2aea2248: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE

* commit '6e5e3e5ab1bab262b7af03b0897a9ce5d2b55a67':