tree c9145bdc2a101a9332fa5bcad7fb94e3970974e8
parent fe4a48c01056f539f041572c5b685fa44eddb9f4
parent db4f28692aacccb57d64f86b3dfd4205bafebf9b
author Geoff Mendal <mendal@google.com> 1445888579 +0000
committer android-build-merger <android-build-merger@google.com> 1445888579 +0000

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

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