tree 1afe84228bae4d176e8ee96cf621294dcc99113e
parent 0d0e466a67a4d73089286c4cb7ea7412cf193686
parent 8cb24434280f88b69dfb6944cd53c2a3e5eb28ec
author Baligh Uddin <baligh@google.com> 1443150300 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443150300 +0000

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

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