tree 7d874308db2eb5440546aa24f012e57174a26f2a
parent df5c0b09299bcce2d03e391f541ab4ed381f132f
parent 16a476c25f9cbf440d9387dcd44383a194c96a98
author Baligh Uddin <baligh@google.com> 1408985609 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408985609 +0000

am 16a476c2: (-s ours) am ebd324d2: (-s ours) am 01f63375: (-s ours) Import translations. DO NOT MERGE

* commit '16a476c25f9cbf440d9387dcd44383a194c96a98':
  Import translations. DO NOT MERGE