Merge "Tolerate flush/finish test assumption failures." am: b821430a47 am: 686f9a59dc
authorNicolas Capens <capn@google.com>
Fri, 26 Jan 2018 02:01:43 +0000 (02:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 02:01:43 +0000 (02:01 +0000)
commit6d5bb89fd2690899abec6f47a8f41f22acf0be46
treed389494203d6cb9a752536f12a11c17df956435a
parent6af025d9fd145307c7bbf4265e1127b1e1005132
parent22fa1270d3b1957da5e2fca5108ff37e0a330a58
Merge "Tolerate flush/finish test assumption failures." am: b821430a47 am: 686f9a59dc
am: 22fa1270d3

Change-Id: Id10dda77bcdc68801979ec69594035ae43dbd24e
framework/common/tcuApp.cpp
framework/common/tcuApp.hpp