tree b89eeee7ceefefaf7538419e27b1e1271d089c53
parent 55f91b7e5424ef7d0529e40cdede8eaa6c6f8c39
parent cc7abc5eddf9c2a47456103a720d28609e94b658
author Geoff Mendal <mendal@google.com> 1445887511 +0000
committer android-build-merger <android-build-merger@google.com> 1445887511 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8961b24ff2  -s ours am: 7976a3fbf4  -s ours
am: cc7abc5edd  -s ours

* commit 'cc7abc5eddf9c2a47456103a720d28609e94b658':
  Import translations. DO NOT MERGE