OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:38:29 +0000 (16:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:38:29 +0000 (16:38 +0000)
commiteca137aa43a36bad8b72d1389a7997dea45e1c37
tree9f3ed1374d69f59c6c876032322ecd564479fc26
parentcdb44fee844c3c603d1a80daa3d228e6b945027b
parent098c04e781906265869aed6125928efb5f1a0b6a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9  -s ours
am: 098c04e781  -s ours

Change-Id: Ie43f65cae3a7422bfbb0d95281e30489f1c36365