tree 73e51c755f4aa6d138e325fed3678c3bf60696d3
parent adc2faa46fdb3e56da09a90b9e9b15c24d93f10a
parent 4c96a0331cf744918fdd2c89af6c3cf5ec7c553a
author Geoff Mendal <mendal@google.com> 1445447647 +0000
committer android-build-merger <android-build-merger@google.com> 1445447647 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 04733e23a3  -s ours
am: 4c96a0331c  -s ours

* commit '4c96a0331cf744918fdd2c89af6c3cf5ec7c553a':
  Import translations. DO NOT MERGE