tree 9a3387bc89bac570d769917d77bf1bea2d4bc953
parent 02e7bbde928bc7e0e4d4d46cf977564c4fada0ca
parent 1697c7a474258fe2d64f22312740f9e9c57203e7
author Baligh Uddin <baligh@google.com> 1411413467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411413467 +0000

am 4117cf1c: (-s ours) am fc3eea68: (-s ours) Import translations. DO NOT MERGE

* commit '4117cf1cb16c134eedc3cfad8dda09ec3a3fe1e9':
  Import translations. DO NOT MERGE