| commit | 6259a7be3b7527ff0461629c270b9ea1f0f0ab89 | [log] [tgz] |
|---|---|---|
| author | Roger Liao <rogerliao@google.com> | Thu Jan 02 22:03:17 2020 +0800 |
| committer | Roger Liao <rogerliao@google.com> | Tue Jan 07 16:44:47 2020 +0800 |
| tree | d9484998a02e513c43bd834f831f6085b69d7c09 | |
| parent | b3b1092a1475647b78922bb0183bb387685f4a67 [diff] | |
| parent | f745489339bf93a818f8ed1056ffa591965a3441 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.13.R1.08.00.00.571.042' into qt-qpr1-dev
Conflicts:
composer/hwc_display_builtin.h
sdm/libs/core/display_base.cpp
sdm/libs/core/display_builtin.h
sdm/libs/core/drm/hw_events_drm.cpp
Bug: 147076486
Change-Id: I188f83c8231f4ac3a9c9871c1f2c192debc07836