OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c0745b94c2 -s ours
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 21:22:14 +0000 (21:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 21:22:14 +0000 (21:22 +0000)
am: f49bf087ba  -s ours

Change-Id: Id61b4a2da9551c8c084d7b5e71333105cbdfb225


Trivial merge