tree 4268b76669c85c609efd5434ee8179825c67c0c2
parent b45b5ee1ca8c014f41e2aba6186285f573437aae
parent 7976a3fbf4581b7b9ef531e8dcd7e6e889d08d76
author Geoff Mendal <mendal@google.com> 1445886971 +0000
committer android-build-merger <android-build-merger@google.com> 1445886971 +0000

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

* commit '7976a3fbf4581b7b9ef531e8dcd7e6e889d08d76':
  Import translations. DO NOT MERGE