tree a433eab9adbeeb011e2c448f99c184cbb8cd540a
parent 077794468a1bfee705366e02ff226fda2366d456
parent 4604e7597041f17dce0f9469ab5dcaae32426cf4
author Geoff Mendal <mendal@google.com> 1445889497 +0000
committer android-build-merger <android-build-merger@google.com> 1445889497 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9865051825  -s ours am: fe4a48c010  -s ours
am: 4604e75970  -s ours

* commit '4604e7597041f17dce0f9469ab5dcaae32426cf4':
  Import translations. DO NOT MERGE