tree 36aac409c1151ee1d7c42cf1820cc2aa5b3e3d1a
parent 54cc50e951d985c1bb2f6e331d8b663eafc77187
parent 8ca88028808d9c290106d6c74058292cf7afb8db
author Geoff Mendal <mendal@google.com> 1458571248 +0000
committer android-build-merger <android-build-merger@google.com> 1458571248 +0000

Import translations. DO NOT MERGE am: 386239e  -s ours am: bf5690c  -s ours am: 163240e  -s ours am: 769cc4c  -s ours am: 635f303  -s ours
am: 8ca8802  -s ours

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