tree c9145bdc2a101a9332fa5bcad7fb94e3970974e8
parent e8be87e96f7c9e854e7ac57475f38fedb8e1cac8
parent 8961b24ff2541fc246e275ae3cc4cdda64934462
author Geoff Mendal <mendal@google.com> 1445886506 +0000
committer android-build-merger <android-build-merger@google.com> 1445886506 +0000

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

* commit '8961b24ff2541fc246e275ae3cc4cdda64934462':
  Import translations. DO NOT MERGE