tree c9145bdc2a101a9332fa5bcad7fb94e3970974e8
parent 7976a3fbf4581b7b9ef531e8dcd7e6e889d08d76
parent 9865051825fbc709510deefa129c4210fadf057a
author Geoff Mendal <mendal@google.com> 1445888456 +0000
committer android-build-merger <android-build-merger@google.com> 1445888456 +0000

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

* commit '9865051825fbc709510deefa129c4210fadf057a':
  Import translations. DO NOT MERGE