OSDN Git Service

Merge "DO NOT MERGE SF: Add property to disable HWC virtual displays" into nyc-mr1-dev
authorDan Stoza <stoza@google.com>
Fri, 12 Aug 2016 16:36:04 +0000 (16:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Aug 2016 16:36:04 +0000 (16:36 +0000)
commite26ce9f612d3afe54b9806beee3fd0a3dc1638be
tree08a09e463ce3ded8afb90971fca13a3398d22905
parent1ff2b85b032f1088263700470aa7bcaa385e9091
parent3cf4bfe2368020b50a3e22360910b6af6590c5be
Merge "DO NOT MERGE SF: Add property to disable HWC virtual displays" into nyc-mr1-dev
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger.h
services/surfaceflinger/SurfaceFlinger_hwc1.cpp