tree 28e216243f0abccbfb91bcd19b533e50fe7928de
parent 40e3e15bfd239919bbacd94fb9927fb1269f60c5
parent 03ccc5bcfb494261708f4873d19a53d35a964439
author Geoff Mendal <mendal@google.com> 1452647543 +0000
committer android-build-merger <android-build-merger@google.com> 1452647543 +0000

Import translations. DO NOT MERGE am: 18f85e2e47  -s ours am: bc599c4e34  -s ours am: ecad9c6591  -s ours
am: 03ccc5bcfb  -s ours

* commit '03ccc5bcfb494261708f4873d19a53d35a964439':
  Import translations. DO NOT MERGE