tree 89eed2a426b01d401c15781df1d387e7daa80fa5
parent dec4ee0c330fbbcd423c23465040032a1095ab0d
parent 9fa63a3720d5ec33bc5d78f938f7bb91c8fae298
author Geoff Mendal <mendal@google.com> 1443643463 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443643463 +0000

am 9fa63a37: (-s ours) Import translations. DO NOT MERGE

* commit '9fa63a3720d5ec33bc5d78f938f7bb91c8fae298':
  Import translations. DO NOT MERGE