tree a7f4d833e4e8a355efec3593b633502bf3439db5
parent 27174a97d74b203bd5612d8f74e2a2d45f1bacf0
parent 03b9ce57b263417b031f34305c1d0f355d8fa0cb
author Baligh Uddin <baligh@google.com> 1442630940 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442630940 +0000

am 03b9ce57: (-s ours) Import translations. DO NOT MERGE

* commit '03b9ce57b263417b031f34305c1d0f355d8fa0cb':
  Import translations. DO NOT MERGE