tree 51d9286307bceaf37ee7071b7ccece185b438507
parent c1f2ffd454589836f6d1c0fd81c8392fbec568a4
parent 66d21439b2fbce29988886ba2d9ca836047c3ad5
author Baligh Uddin <baligh@google.com> 1413926084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413926084 +0000

am 66d21439: (-s ours) am 143653e7: (-s ours) Import translations. DO NOT MERGE

* commit '66d21439b2fbce29988886ba2d9ca836047c3ad5':