OSDN Git Service

[automerger skipped] Merge remote-tracking branch 'aosp/upstream-master' into HEAD...
authorJason Macnak <natsu@google.com>
Fri, 18 Sep 2020 21:36:31 +0000 (21:36 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 18 Sep 2020 21:36:31 +0000 (21:36 +0000)
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: Iaa20036c2501b47c4b5bebef7a38b16d59017e18


Trivial merge