tree a433eab9adbeeb011e2c448f99c184cbb8cd540a
parent eac54076f236b1adade399a95e9298597ae92ee3
parent dd21740d6b6ec56e812cd2845c85fe3efd3e3e6a
author Geoff Mendal <mendal@google.com> 1445889586 +0000
committer android-build-merger <android-build-merger@google.com> 1445889586 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: db4f28692a  -s ours am: ad3bd48dfe  -s ours
am: dd21740d6b  -s ours

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