| commit | 6b08ba6b9c6145d2d7759a3195e6680f4c77c98d | [log] [tgz] |
|---|---|---|
| author | Arun Kumar K.R <akumarkr@codeaurora.org> | Fri Feb 16 14:29:54 2018 +0530 |
| committer | Arun Kumar K.R <akumarkr@codeaurora.org> | Fri Feb 16 14:29:54 2018 +0530 |
| tree | 88adaa6634509ecbb5df8e312e3e9f592b65509c | |
| parent | d19b9219dd09e7ec55856c0813f8a6ccb488b3ca [diff] | |
| parent | edf26de0caff5183d8479e76b7ff2c3a0f860ef4 [diff] |
Merge remote-tracking branch 'quic/display.lnx.4.0' into display.lnx.5.0 Conflicts: sdm/libs/hwc2/display_null.cpp sdm/libs/hwc2/display_null.h Change-Id: I949370bf73a0b21be5769339488104ba9d4eda79