OSDN Git Service

[automerger skipped] Merge Android R am: 25ff66748d -s ours am: bdb6e78844 -s ours
authorXin Li <delphij@google.com>
Fri, 11 Sep 2020 02:02:43 +0000 (02:02 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 11 Sep 2020 02:02:43 +0000 (02:02 +0000)
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: I3ed8261d785984fc5f8f4f2916f232cb12e0e677


Trivial merge