commit | ea5b69a0327130b9553a3ad6ede3efb2734be756 | [log] [tgz] |
---|---|---|
author | lucaswei <lucaswei@google.com> | Thu Nov 12 17:34:25 2020 +0800 |
committer | lucaswei <lucaswei@google.com> | Thu Nov 26 17:59:17 2020 +0800 |
tree | c649a6f2b30192d52c18ed29f87ea1ede509570e | |
parent | e7ab2aa8bd2f6f27b311ccada3722d20dee4bcef [diff] | |
parent | 0f780cc21dd1e16bf5e03df0e7e6a54adb28602a [diff] |
Merge LA.UM.9.12.R2.10.00.00.685.039 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 Conflicts: msm/dsi/dsi_display.c msm/dsi/dsi_panel.c msm/msm_atomic.c Bug: 172988823 Signed-off-by: lucaswei <lucaswei@google.com> Change-Id: I1312736da70634a1fbb66efa29a07acc89b32f21