| commit | 1a2ae7a005e82b28de0281d7509338de0bb748dd | [log] [tgz] |
|---|---|---|
| author | Naseer Ahmed <naseer@codeaurora.org> | Wed Jan 25 20:23:45 2017 -0500 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Jan 25 17:30:08 2017 -0800 |
| tree | 37e5fda44a4ac267ce5beb4d49c099557a1589fe | |
| parent | e719587a795507d0fc6d22fe857ff498ba89dfe9 [diff] |
surfaceflinger: Fix incorrect merge conflict resolution Matches upstream now and fixes compilation issue with USE_HWC2 CRs-Fixed: 1116342 Change-Id: I3689b19118c6c5c7114c41babe089e3f3452e8ae