tree 0f705c1d97a224af03e1f875f78f1e941003e852
parent 64cd7c6d1e7b243f7839544cb23ab2fad79b86ab
parent ea6ea27ba6ee2f89ab768a23ca036d5cc383c47f
author Geoff Mendal <mendal@google.com> 1445448536 +0000
committer android-build-merger <android-build-merger@google.com> 1445448536 +0000

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

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