OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:10:39 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:10:39 +0000 (21:10 +0000)
am: 497bbfd9ac  -s ours

Change-Id: I27a8de5dc0a587e0df6e6569f7703733c5d222fe


Trivial merge