tree 3417609597baaf57745c94a74f909afa643c6235
parent c7a3888a1397b7ab1dfbbcf86aba31765ea6017c
parent 40831d0bdaa12903d1668e8f955a5539a6dcbf11
author Geoff Mendal <mendal@google.com> 1458356516 +0000
committer android-build-merger <android-build-merger@google.com> 1458356516 +0000

Import translations. DO NOT MERGE
am: 40831d0  -s ours

* commit '40831d0bdaa12903d1668e8f955a5539a6dcbf11':
  Import translations. DO NOT MERGE