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)
commit22fa1270d3b1957da5e2fca5108ff37e0a330a58
tree3715ffdd663a5f02f510dc7c7c5981dbe5a1fbd8
parent7a9740c3ac8aee0d8de6293c49c0d846cb9d85f5
parent686f9a59dc2637205381bd96386e62b1894f6117
Merge "Tolerate flush/finish test assumption failures." am: b821430a47
am: 686f9a59dc

Change-Id: I3e5cd0b3c719d0c18cc58b81ae82eb5b24aaa633