tree 682a7846840ed27e236c3ae72b732f9703eaa185
parent c86080891071b49a0b48e0dd361a70523dc45fd8
parent dfd75c536f268ff735f7c1f16cdb5b88508ffe15
author Bill Yi <byi@google.com> 1500545325 +0000
committer android-build-merger <android-build-merger@google.com> 1500545325 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123  -s ours
am: dfd75c536f  -s ours

Change-Id: If8ab0ac81b196e61796bb21d5294d2e30d5415a1