OSDN Git Service

Merge changes I06aadb55,I2c5b2bdc
authorMyles Watson <mylesgw@google.com>
Fri, 10 Jan 2020 20:12:14 +0000 (12:12 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Jan 2020 20:12:14 +0000 (12:12 -0800)
am: bdf11eb2c5

Change-Id: Idc25e97894bcfb600e3e4810e284ea93172f0d9b


Trivial merge