tree 4ba3bbb9ba4df713bf35e14b7eb7a02bdad53789
parent 4426223bb4c8939fb15d778878a37209ad27491d
parent 80bf479e16c904732f63f124d226a07689b8ca98
author Geoff Mendal <mendal@google.com> 1445451909 +0000
committer android-build-merger <android-build-merger@google.com> 1445451909 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 80bf479e16  -s ours

* commit '80bf479e16c904732f63f124d226a07689b8ca98':
  Import translations. DO NOT MERGE