tree 25625d57df4d8aeb15829f6a75cacb045905fbbf
parent ba480fd949f1ad36469f7f866e5ed990cfcf54f2
parent 7102c3675f5058706dbf1cc62b23c014b167b75e
author Geoff Mendal <mendal@google.com> 1445888636 +0000
committer android-build-merger <android-build-merger@google.com> 1445888636 +0000

Import translations. DO NOT MERGE
am: 7102c3675f  -s ours

* commit '7102c3675f5058706dbf1cc62b23c014b167b75e':
  Import translations. DO NOT MERGE