commit | dffef568273467477d28893875eeb939f8f71f21 | [log] [tgz] |
---|---|---|
author | Jason Macnak <natsu@google.com> | Fri Apr 01 09:58:38 2022 -0700 |
committer | Jason Macnak <natsu@google.com> | Fri Apr 01 09:58:38 2022 -0700 |
tree | 40006207a1caf05720d4b09009899dd940023875 | |
parent | 9f0521cb060379c160af218aa87f7c65edc658d9 [diff] | |
parent | db3c6fcf02280603b78d9e18289dea3644fa0159 [diff] |
Merge branch 'aosp/upstream-main' into 'aosp/main' ... to pull in https://crrev.com/c/3563512 to avoid trying to use dmabuf heap allocator when dmabuf system heap is not available. Bug: b/227375257 Test: cvd start Test: vts -m VtsHalGraphicsMapperV4_0Target Change-Id: I2de7d0b8e6a898fa34333ade9204929342268659