tree b3f93590e3202554aa0d22f888c2f7cfc1230e0d
parent 4cab51620b7a580e7a54599c03d4b88e8f868553
parent c8ddc96f01b52b4aab1741fc033076dd46b076f3
author Geoff Mendal <mendal@google.com> 1450242355 +0000
committer android-build-merger <android-build-merger@google.com> 1450242355 +0000

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

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