| commit | ce0d81ef1a7af127e780b54d581d0cfa7a81d566 | [log] [tgz] |
|---|---|---|
| author | DesmondH <desmondh@google.com> | Wed Dec 21 03:32:53 2022 +0000 |
| committer | DesmondH <desmondh@google.com> | Wed Dec 21 03:32:54 2022 +0000 |
| tree | 92850eb8d8bf64c79e9b7ebb46ae58142063def2 | |
| parent | 23a38dc4e80303d0eaa35171544d55bf24746112 [diff] | |
| parent | 778a990d1ce4eb357540275a3aea9db72ccb1113 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.415' Conflicts: composer/hwc_display_builtin.cpp gralloc/gr_buf_mgr.cpp gralloc/gr_utils.cpp libqservice/IQService.h sde-drm/drm_plane.cpp Bug: 253163588 Bug: 255678025 Change-Id: I493a1d61e700e4e137582574c06aeadfed8a260d