tree 100bd59c83da81af3dea9341a9c7c958b4b4269f
parent 51b43e1236fa70711d914d0bc117a1ac745f0172
parent 84c62dde3d737e0cc194a24e76dbdac9e8c75170
author Geoff Mendal <mendal@google.com> 1445264939 +0000
committer android-build-merger <android-build-merger@google.com> 1445264939 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 84c62dde3d  -s ours

* commit '84c62dde3d737e0cc194a24e76dbdac9e8c75170':
  Import translations. DO NOT MERGE