Merge "Tolerate flush/finish test assumption failures."
authorNicolas Capens <capn@google.com>
Thu, 25 Jan 2018 23:46:13 +0000 (23:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 23:46:13 +0000 (23:46 +0000)
am: b821430a47

Change-Id: I319da491080e82250693a32a72ab0d3c5c318aa6


Trivial merge