tree 8f86f5a53ead0787376c4b2f2c31179dc9b0cbe5
parent c49ecff854d5521df21284aa361577cce553cc3a
parent 7f174ff6653154c4f1c3b184c402e92a4f53b7dd
author Geoff Mendal <mendal@google.com> 1445446853 +0000
committer android-build-merger <android-build-merger@google.com> 1445446853 +0000

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

* commit '7f174ff6653154c4f1c3b184c402e92a4f53b7dd':
  Import translations. DO NOT MERGE