tree 8711b742a7511d48a961528cd33b8aca2c1ad6d1
parent 527f98332ca7f95b72be00f9762e1ac07115694a
parent 00c44332d91b375892d5521c41f4da050775b212
author Geoff Mendal <mendal@google.com> 1450284148 +0000
committer android-build-merger <android-build-merger@google.com> 1450284148 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 10bc1c7000  -s ours am: c8ddc96f01  -s ours am: 5b1b0a8224  -s ours
am: 00c44332d9  -s ours

* commit '00c44332d91b375892d5521c41f4da050775b212':
  Import translations. DO NOT MERGE