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

Change-Id: I3e5cd0b3c719d0c18cc58b81ae82eb5b24aaa633


Trivial merge