| commit | ef69621a27b2eb6483ac79ae4044d632ac5ec3be | [log] [tgz] |
|---|---|---|
| author | Lucas Wei <lucaswei@google.com> | Tue Mar 09 11:13:53 2021 +0800 |
| committer | Lucas Wei <lucaswei@google.com> | Tue Mar 09 11:14:08 2021 +0800 |
| tree | 15ce0759f7bf442d2fe14db03493e08f394c69f2 | |
| parent | dcbdf1fca3c76e6bf04e57f60e77b10e14f804ab [diff] | |
| parent | a8aac66197dab6dcdc3c1f51bb66285d237b7a0f [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/vidc/msm_vidc_common.c Bug: 172988823 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: Ia851acbba50ef633cb45130bccd5be788e8e4cf7