tree 98ba122b57a706ee2372b80a9ac3b6d3965e9de4
parent 67f65df09ee7d08ff313829374d50f30fe7699df
parent 289fd0d07959b8c5644f289f8bcefa704b5568b6
author Alistair Strachan <alistair.strachan@imgtec.com> 1497548231 +0000
committer android-build-merger <android-build-merger@google.com> 1497548231 +0000

Merge "Fix getDisplayInfo() for SurfaceFlinger in HWC2 mode. am: c175253b6d am: f86e12ba89" into oc-dr1-dev-plus-aosp
am: 289fd0d079

Change-Id: I1cc67242355440e7c6ab931bd400db2b6e2445cb