From: Jason Macnak <natsu@google.com>
Date: Fri, 18 Sep 2020 20:29:45 +0000 (+0000)
Subject: [automerger skipped] Merge remote-tracking branch 'aosp/upstream-master' into HEAD... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=42239a749b8ff98088adbde01409e87ec9718c14;hp=-c;p=android-x86%2Fexternal-minigbm.git

[automerger skipped] Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 910da248a7 -s ours am: f2f8b352db -s ours am: c247e4922d -s ours

am skip reason: Change-Id I27f020b4f661890bcc2817deb09ffb9af1c76f1b with SHA-1 1476c7ea85 is in history

Original change: https://android-review.googlesource.com/c/platform/external/minigbm/+/1431491

Change-Id: I665536892e1ae8252412ec03764e1ba2dfb4b4e2
---

42239a749b8ff98088adbde01409e87ec9718c14