OSDN Git Service

Merge changes I8cc3ce7d,Ie1a7bfd2,Id472ed4e into nyc-dev
authorDan Stoza <stoza@google.com>
Tue, 23 Feb 2016 19:47:56 +0000 (19:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Feb 2016 19:47:56 +0000 (19:47 +0000)
commita4c2c3ba1ed2d741edfa652bf8f2bab229389e8e
treeab03ebbbe32dfd28316eaeb2f1b4aec076c38d85
parentc4e490047a7dd605fb087b71d3b97182e409985c
parent3ce460440b0ab0b6d6407c9d8735b19f6e3b8408
Merge changes I8cc3ce7d,Ie1a7bfd2,Id472ed4e into nyc-dev

* changes:
  libgui: Allow for pending releases in GLConsumer
  SF: HWC2 C++ shim
  SF: HWC2On1Adapter
libs/gui/GLConsumer.cpp