tree 79c5154153342cd371cc2e374ee5ee418e943c78
parent 1aea1dbc40d40c2693e8bd7088adbbf2d4939366
parent b20f3b2b82eaf0446818805ef1f8ba2b01d9d9f8
author Geoff Mendal <mendal@google.com> 1456321450 +0000
committer android-build-merger <android-build-merger@google.com> 1456321450 +0000

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

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