From: Xin Li <delphij@google.com>
Date: Fri, 11 Sep 2020 03:33:34 +0000 (+0000)
Subject: [automerger skipped] Merge Android R am: 25ff66748d -s ours am: bdb6e78844 -s ours... 
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-minigbm.git;a=commitdiff_plain;h=b51c5e030231d877aac27861d64593084658a888

[automerger skipped] Merge Android R am: 25ff66748d -s ours am: bdb6e78844 -s ours am: 49b83e0635 -s ours

am skip reason: Change-Id I8d7971fe52ff43b175a9821c97a6f3c6d380a01d with SHA-1 cf0ceff91e is in history

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

Change-Id: Ib78b87eaf49bac759670fa2beae2e5c26f219484
---

b51c5e030231d877aac27861d64593084658a888