OSDN Git Service

Merge changes Ib064f067,Iea33782b
authorMyles Watson <mylesgw@google.com>
Wed, 15 Jan 2020 16:34:29 +0000 (08:34 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jan 2020 16:34:29 +0000 (08:34 -0800)
am: ef2594ff01

Change-Id: If9bad394e679cb591419e8cbd410ede3fa047634


Trivial merge