OSDN Git Service

[automerger skipped] Merge 'aosp/upstream-master' into 'aosp/master' am: b337d757c9...
authorJason Macnak <natsu@google.com>
Wed, 8 Jul 2020 21:47:45 +0000 (21:47 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 8 Jul 2020 21:47:45 +0000 (21:47 +0000)
commit21cbafd44c74b794034bcfc8c48b7b15f02da83b
tree8166b03e309e55786e7a5545001db95e3028308c
parent03f2dd1f20c173a5799645bc337959ffb421430e
parentcb6d35f648aa7165a94a73bfa5c30e8488de377d
[automerger skipped] Merge 'aosp/upstream-master' into 'aosp/master' am: b337d757c9 am: f034387461 -s ours am: cb6d35f648 -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/+/1358643

Change-Id: Idd351d88d44f174445d5faba2adc393ddf4fe4a0