OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 23:11:49 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 23:11:49 +0000 (23:11 +0000)
am: 1860adf0cd  -s ours

Change-Id: I834f8a47ed9a76b0efb9b98fdeb3ea779444c1c3


Trivial merge