tree 67e261b29bc1bca3245c3742e858067d90f23af0
parent 08a892ee7d3a04dae02671942e057a4e6ec2ae39
parent aa276a9dadca9ac46962a1284b39d37feff77857
author Geoff Mendal <mendal@google.com> 1455720358 +0000
committer android-build-merger <android-build-merger@google.com> 1455720358 +0000

Import translations. DO NOT MERGE
am: aa276a9dad  -s ours

* commit 'aa276a9dadca9ac46962a1284b39d37feff77857':
  Import translations. DO NOT MERGE