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)
commita34aade39ae0cf56c1747c13defd996b937dc9f3
treeac3eafc1e9f91b0f4be13adf32de764a32d45160
parent5e7f79bf29e488ab589daf98b089697b8c767765
parent377c2033750ad2a47e5c560f982a0242ea7dc79e
Merge changes I5d907c33,Ibce48cd2 into cw-f-dev

* changes:
  In SurfaceFlinger, test fence before merging
  libui: Change hasSignaled to return optional<bool>