tree 4268b76669c85c609efd5434ee8179825c67c0c2
parent 1fd4da3b4f502adbe55e8340c3ec433f08ac89bd
parent 76941becab388c347577dfc60d6fae4b190b684a
author Geoff Mendal <mendal@google.com> 1445886784 +0000
committer android-build-merger <android-build-merger@google.com> 1445886784 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 82b5276866  -s ours
am: 76941becab  -s ours

* commit '76941becab388c347577dfc60d6fae4b190b684a':
  Import translations. DO NOT MERGE