OSDN Git Service

Merge changes I5d907c33,Ibce48cd2 into cw-f-dev
authorMatthew Bouyack <mbouyack@google.com>
Tue, 18 Oct 2016 17:10:30 +0000 (17:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Oct 2016 17:10:30 +0000 (17:10 +0000)
* changes:
  In SurfaceFlinger, test fence before merging
  libui: Change hasSignaled to return optional<bool>


Trivial merge