tree 4268b76669c85c609efd5434ee8179825c67c0c2
parent dd21740d6b6ec56e812cd2845c85fe3efd3e3e6a
parent 515e97a52c0b15d3e7a2d629d3faa821fa4f285e
author Geoff Mendal <mendal@google.com> 1445889170 +0000
committer android-build-merger <android-build-merger@google.com> 1445889170 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 337495bded  -s ours
am: 515e97a52c  -s ours

* commit '515e97a52c0b15d3e7a2d629d3faa821fa4f285e':
  Import translations. DO NOT MERGE