tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent 5355703217af5b63e496b26b4c8257f426fcdd86
parent 0b1acbb5bf0301eb2299a20a72c64b01b8b2abdf
author Baligh Uddin <baligh@google.com> 1412094704 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412094704 +0000

am 0b1acbb5: (-s ours) Import translations. DO NOT MERGE

* commit '0b1acbb5bf0301eb2299a20a72c64b01b8b2abdf':
  Import translations. DO NOT MERGE