tree e86c80242eda71ddced26f24d4dc5ce7b16c8f5a
parent 2836438f59941279ad1873fd062083438e1d2b0f
parent 0f345e773933aa941960a48181ff93a392958ccd
author Baligh Uddin <baligh@google.com> 1384405766 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384405766 -0800

am 0f345e77: (-s ours) am 45c23976: (-s ours) am 56faf220: (-s ours) Import translations. DO NOT MERGE

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