tree 40ea7e45b3090af18fc133f4fa0717873e2db86a
parent e300b83aaaa50fe531092867a782b7b49a8a6958
parent c06cc9cccb3cf3c7f9d2aec706c27c34cd6162a0
author Jason Macnak <natsu@google.com> 1633621745 -0700
committer Jason Macnak <natsu@google.com> 1633621745 -0700

Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'

... to update Minigbm for Cuttlefish to pull in https://crrev.com/c/3208931
to restrict 2D allocs to max supported SwiftShader size.

Bug: b/194426249
Test: `cts -m CtsNativeHardwareTestCases` with aosp/1845813
Change-Id: I9f538e48a72ec699617b9e653812f2b785c5e39a