| commit | c3f59b5953b32f626a29d117a49c738550b05310 | [log] [tgz] |
|---|---|---|
| author | Roger Liao <[email protected]> | Mon Nov 18 22:12:30 2019 +0800 |
| committer | Roger Liao <[email protected]> | Thu Nov 21 21:14:01 2019 +0800 |
| tree | a84a920fff3484c3fe19ae9da82e5fc8fbe06738 | |
| parent | c4c8de6a206a13c8cc6ff2b152e1032302c2fd12 [diff] | |
| parent | 2d563af6836040d81ea31a58dc301dd57956091d [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.13.R1.08.00.00.571.029' into qt-qpr1-dev Conflicts: composer/Android.mk sdm/libs/core/display_base.h sdm/libs/core/drm/hw_device_drm.cpp Bug: 144659331 Change-Id: I76534ba0578e972ccea80b25f23a6e2d95004902