From: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Date: Fri, 6 Mar 2020 01:03:56 +0000 (+0000)
Subject: Merge 'aosp/upstream-master' into 'aosp/master' am: 24cb462579 am: 88b0a4235a
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cfd96315f8956d2bc647f7fcb774cdf1af91bf90;p=android-x86%2Fexternal-minigbm.git

Merge 'aosp/upstream-master' into 'aosp/master' am: 24cb462579 am: 88b0a4235a

Change-Id: I3637cf92fe783b01da45222d53e7c7b08fdbbdaa
---

cfd96315f8956d2bc647f7fcb774cdf1af91bf90