OSDN Git Service

Merge "BufferQueue/SF: Add OccupancyTracker" into nyc-mr1-dev
authorDan Stoza <stoza@google.com>
Wed, 25 May 2016 17:37:59 +0000 (17:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 May 2016 17:37:59 +0000 (17:37 +0000)
1  2 
services/surfaceflinger/Layer.cpp
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger_hwc1.cpp

Simple merge