tree b89eeee7ceefefaf7538419e27b1e1271d089c53
parent b55de5453cbbcb9864207dda2ea9dae49db5b91a
parent b45b5ee1ca8c014f41e2aba6186285f573437aae
author Geoff Mendal <mendal@google.com> 1445887426 +0000
committer android-build-merger <android-build-merger@google.com> 1445887426 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 4917e9dd1c  -s ours am: e8be87e96f  -s ours
am: b45b5ee1ca  -s ours

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