OSDN Git Service

Merge "BufferQueue/SF: Add OccupancyTracker" into nyc-mr1-dev
authorDan Stoza <stoza@google.com>
Wed, 25 May 2016 18:40:55 +0000 (18:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 18:40:55 +0000 (18:40 +0000)
am: faa71321b0

* commit 'faa71321b0862fac97ad1f7825860fb740cc8507':
  BufferQueue/SF: Add OccupancyTracker

Change-Id: I868b56c8502033877b08146c1cffeaaa263acc64

1  2 
libs/gui/Android.mk
libs/gui/IGraphicBufferConsumer.cpp
services/surfaceflinger/Layer.cpp

Simple merge
Simple merge
Simple merge