tree f6142a40496693621b08b33f0ab8570b69f95aa0
parent f873bd4d31c7055695ce74f44b2c97f9df71f5a6
parent 377c2033750ad2a47e5c560f982a0242ea7dc79e
author Matthew Bouyack <mbouyack@google.com> 1476810982 +0000
committer android-build-merger <android-build-merger@google.com> 1476810982 +0000

In SurfaceFlinger, test fence before merging
am: 377c203375

Change-Id: Icfbcbe58de9f6930f06774f47e6576ec523115bd