| commit | ce94441e91ac604b9c6da894441aade6dcadc613 | [log] [tgz] |
|---|---|---|
| author | Alex Sarraf <asarraf@codeaurora.org> | Wed Jan 30 22:02:09 2019 -0800 |
| committer | Alex Sarraf <asarraf@codeaurora.org> | Thu Jan 31 10:25:57 2019 -0800 |
| tree | 1b9c5cc0e8ae0aea466f4e4fb7af1e61dbd4ecb4 | |
| parent | c81fd0b8ec432712d761785af79cc85ef0aab7ba [diff] | |
| parent | 842dabec876a4fcf9dc34bebb42bd0c2f9fec9f1 [diff] |
Merge commit 'quic/display.lnx.5.0' into 6.0 -Resolve conflicts with display state (Reverts Ic279270e04772e90b34765d021a5d7c9b82a1dea) Change-Id: I15120f3f458b5c927706c1600fd8b4341bafa9f2