OSDN Git Service

Merge changes I0f07043f,Ib4635ee4,I472ad9f0 into nyc-dev
authorDan Stoza <stoza@google.com>
Fri, 8 Apr 2016 23:13:01 +0000 (23:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 8 Apr 2016 23:13:01 +0000 (23:13 +0000)
commit97a46df0ee9708822f190a76047c490f54c199cd
tree1e98ef22bba5def39716a8b35716b19c04686f8d
parent45d15b835738497f812bec55affc9a1cba4ec343
parentc4f471e75a8ec64ec34e3f2944a5a756215d0bec
Merge changes I0f07043f,Ib4635ee4,I472ad9f0 into nyc-dev

* changes:
  Plumb HDR capabilities up to SurfaceComposerClient
  HWC2: Add getHdrCapabilities to C++ shim
  HWC2: Add getHdrCapabilities stub to adapter
services/surfaceflinger/SurfaceFlinger.cpp