| commit | e0da603c441cfc584135f9bd7c3b14b9cf9f273e | [log] [tgz] |
|---|---|---|
| author | ChihYao Chien <[email protected]> | Fri Mar 19 17:35:53 2021 +0800 |
| committer | ChihYao Chien <[email protected]> | Tue May 04 11:32:58 2021 +0800 |
| tree | d61407b1f3188b882a1d2cd270d5eb631978c52c | |
| parent | 6605954e44f7bcaf6feb02d826d5cd5a5cba86dc [diff] | |
| parent | 0481dc6217edeb22e99110e1295bc613057e10d9 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R1.11.00.00.597.108' into HEAD Conflicts: composer/hwc_display_builtin.cpp composer/hwc_display_builtin.h config/display-product.mk sdm/libs/core/display_base.cpp Bug: 182748782 Change-Id: I734afcf51b74151e5d6a2a9f8032d79df1ce2140