tree b6b33371c821eb82f0803ecc84974a8a2caab752
parent 1c44556c797cceb86f2ca489f619c686524cb22f
parent 8cfa7ffaf1fd482e0cf6b9db612270023bdb382e
author Drew Davenport <ddavenport@google.com> 1733520282 -0700
committer Drew Davenport <ddavenport@google.com> 1733520370 -0700

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

* aosp/upstream-main:
  drm_hwcomposer: Fix incorrect modeset buffer size
  drm_hwcomposer: Clear staged_mode_config_id_ after SetConfig
  drm_hwcomposer: Add property for config groups
  drm_hwcomposer: Fix build_deploy script and switch it to hwc3
  drm_hwcomposer: hwc3: Fix build with Android-13

Bug: 362641912, 380448007
Test: Presubmit
Change-Id: I82c2c6e68fa1b0638f49d7774dc4db6615c1b267