tree ac3eafc1e9f91b0f4be13adf32de764a32d45160
parent 5e7f79bf29e488ab589daf98b089697b8c767765
parent 377c2033750ad2a47e5c560f982a0242ea7dc79e
author Matthew Bouyack <mbouyack@google.com> 1476810630 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1476810630 +0000

Merge changes I5d907c33,Ibce48cd2 into cw-f-dev

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