OSDN Git Service

Merge remote-tracking branch 'aosp/upstream-master' into HEAD
authorJason Macnak <natsu@google.com>
Fri, 18 Sep 2020 16:07:51 +0000 (09:07 -0700)
committerJason Macnak <natsu@google.com>
Fri, 18 Sep 2020 16:07:51 +0000 (09:07 -0700)
... to update Minigbm for Cuttlefish to have Gralloc3 and
Gralloc4 support.

Bug: b/161909468
Test: launch_cvd
Merged-In: I27f020b4f661890bcc2817deb09ffb9af1c76f1b
Change-Id: I11e31543d3298c2cac67d80e77058d7cd95907db

1  2 
cros_gralloc/gralloc0/gralloc0.cc
virtio_gpu.c

Simple merge
diff --cc virtio_gpu.c
Simple merge