| commit | 8645ba2aae54caa630b3d6c2e1ea7bd1c4296bcc | [log] [tgz] |
|---|---|---|
| author | Robin Peng <[email protected]> | Tue May 12 17:06:14 2020 +0800 |
| committer | Roger Liao <[email protected]> | Thu May 21 19:19:49 2020 +0800 |
| tree | 0157861e27f2e4d55ca413414ff523989a2cc6d9 | |
| parent | 62e8bbfa4d790fdc4113074c360007ef6330d2af [diff] | |
| parent | ebddbe4ac79cc88ec05f4902a4a268aa7c355c30 [diff] |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.R2.10.00.00.685.004' into rvc-d1-dev Conflicts: composer/QtiComposerClient.cpp composer/hwc_display.h composer/hwc_session.cpp gralloc/QtiMapper.cpp gralloc/gr_buf_mgr.cpp Bug: 156322859 Change-Id: Ia64c12025ce197cc5b54caf4e22d570ad60d86a1