tree bd32a56172327ac089568f24fa3f78d01577a35b
parent bc20b8c321f11471ae97a6e7dade3a04e10a9e7a
parent 35fbb9f9e59795e233fb59cb5a87573e4669aebd
author Baligh Uddin <baligh@google.com> 1392268749 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392268749 -0800

am 35fbb9f9: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '35fbb9f9e59795e233fb59cb5a87573e4669aebd':
  Import translations. DO NOT MERGE