tree 1622732e11467d740155bf9117555a3d09a79b6d
parent 440b5ccb0bf22f75ffef5d47d18d54fd6ede9fea
parent 78e6f4f56253583c2f647a5636a043b591ed20a7
author Geoff Mendal <mendal@google.com> 1450242135 +0000
committer android-build-merger <android-build-merger@google.com> 1450242135 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 531eb5b484  -s ours am: 57a89670cb  -s ours
am: b16da9aef2  -s ours

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