tree b89eeee7ceefefaf7538419e27b1e1271d089c53
parent 0b5c65a3e181dc272d3dcb3da69e0f5e6dd9e5c8
parent 5f4f059440f1d438280a829c6f1db42a2f432372
author Geoff Mendal <mendal@google.com> 1445887339 +0000
committer android-build-merger <android-build-merger@google.com> 1445887339 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 82b5276866  -s ours am: 76941becab  -s ours
am: 5f4f059440  -s ours

* commit '5f4f059440f1d438280a829c6f1db42a2f432372':
  Import translations. DO NOT MERGE