| commit | 363c669342c915aa45ad4695f646867f36b65c45 | [log] [tgz] |
|---|---|---|
| author | Robin Peng <[email protected]> | Mon Jun 15 11:03:33 2020 +0800 |
| committer | Robin Peng <[email protected]> | Mon Jun 15 18:25:06 2020 +0800 |
| tree | a47baaf2d088a2acca380636807122066b565e6b | |
| parent | c0e0665140fa719ff3b0dc39d849526e5e9a28a5 [diff] | |
| parent | 6d1d83fe45698cb9229cc4aa09403f7634103a52 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.011' into rvc-d1-dev Conflicts: composer/QtiComposerClient.cpp composer/hwc_display.cpp composer/hwc_display_builtin.h composer/hwc_session.cpp composer/hwc_session.h config/display-product.mk gralloc/gr_buf_mgr.cpp Bug: 157858241 Change-Id: Iff0a73828a49da1b846bdc010002ffb45b3edea2