tree b91386b35d311b71ea0806f481979d05cc587fce
parent 48bde67af050c376f716dd0f8d5bb17cd9c7575c
parent 93e157a883e3c8ab5f4ff434cb33a6c71ad01a94
author Geoff Mendal <mendal@google.com> 1445451442 +0000
committer android-build-merger <android-build-merger@google.com> 1445451442 +0000

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9e30c4b406  -s ours
am: 93e157a883  -s ours

* commit '93e157a883e3c8ab5f4ff434cb33a6c71ad01a94':
  Import translations. DO NOT MERGE