OSDN Git Service

Merge changes into stage-aosp-master
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 15 Oct 2018 15:00:04 +0000 (15:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 Oct 2018 15:00:04 +0000 (15:00 +0000)

Trivial merge