OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Mon, 20 Nov 2017 22:31:36 +0000 (22:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Nov 2017 22:31:36 +0000 (22:31 +0000)
commit9a7789a0fc00b7c528a5c52a08a839073f8817e7
treed7db0803c8476aa11f12f9dc3231bcc63e1441d4
parent8b334cb99a94c39f1585ebd8d4b284eb3caf785e
parentae351b3266a1607a1a83239dc4c647431ae95acb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: ae351b3266  -s ours

Change-Id: I7004ff8745bf3ecbb1e947d5c064cca955f9e35e