OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped...
authorBill Yi <byi@google.com>
Fri, 6 Jul 2018 03:56:04 +0000 (20:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 03:56:04 +0000 (20:56 -0700)
am: 8700285134  -s ours

Change-Id: Ice563d38360e1be62c5f6b869dc69f1ce5dfff24


Trivial merge