OSDN Git Service

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