OSDN Git Service

Merge 'aosp/upstream-master' into HEAD
authorJason Macnak <natsu@google.com>
Wed, 28 Oct 2020 20:27:30 +0000 (13:27 -0700)
committerJason Macnak <natsu@google.com>
Wed, 28 Oct 2020 20:27:30 +0000 (13:27 -0700)
commit42ca6159e52c5a2217825da02a26cf504998301b
tree99a6e619c3669efbde0343f2a196535b4ce742ce
parent96edf3270ecb87871c6b67ca588cccaee4c424c2
parent16be5a74aab07f80c3c5bedbfce390aa313e24c6
Merge 'aosp/upstream-master' into HEAD

... to pull in PlaneLayout metadata fix http://crrev.com/c/2503481

Bug: b/171019648
Test: launch_cvd
Test: launch_cvd --gpu_mode=gfxstream
Change-Id: I9c2a52e2eca3339c024154840cb91f65bb7ed577
cros_gralloc/gralloc0/gralloc0.cc