tree f76bfa060614336d3f355bec8d4321433403688e
parent 6ca311696d3abc46c0548cc1467b6dc10eb1a41e
parent f377ff7bd6b971728ae764a3c7b78be21acfd26e
author Jason Macnak <natsu@google.com> 1643134806 -0800
committer Jason Macnak <natsu@google.com> 1643135150 -0800

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

... to pull in f0c507f16b99ff9ac30fb1a95fd1d1c1c9eaf55a to fix
crashes when display does not yet have a active mode.

Bug: b/216148216
Test: launch_cvd --gpu_mode=gfxstream --hwcomposer=drm
Change-Id: Ic75a1c8b516017d93dc9fdb1ef691b457fb61742