tree 76064cea9a95758cc1b5e68c90217049264b151a
parent 474be7aa76f2eaf6f4ed8f1bec03967512dfa575
parent 9fae8df960e0ecb190434202cafbd865f165696b
author Baligh Uddin <baligh@google.com> 1363808073 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363808073 +0000

am 9fae8df9: (-s ours) Import translations. DO NOT MERGE

* commit '9fae8df960e0ecb190434202cafbd865f165696b':
  Import translations. DO NOT MERGE