OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 26 Jan 2018 01:07:08 +0000 (01:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 01:07:08 +0000 (01:07 +0000)
am: ab6b536629  -s ours

Change-Id: I7b8b594f6c3745fcbb5e16353eae3eacfba2c94b


Trivial merge