OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 22:08:03 +0000 (22:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 22:08:03 +0000 (22:08 +0000)
am: 4dfc160224  -s ours

Change-Id: I9f96ce4c677fafd32b612735089d3ae97d8fa16b


Trivial merge