tree ea9eef38ad7eaba7c085f54ca39d896398a27aca
parent d1492deab0b9255efde310396f07510db48e5ce3
parent 8efc0779143fde43410fcaf228cecbf975119569
author Baligh Uddin <baligh@google.com> 1400729055 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400729055 +0000

am 8efc0779: (-s ours) am 78569657: (-s ours) Import translations. DO NOT MERGE

* commit '8efc0779143fde43410fcaf228cecbf975119569':
  Import translations. DO NOT MERGE