am 7c0df341: (-s ours) am 19064468: Lower correlation threshold in flush-finish tests...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:50:19 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:50:19 +0000 (19:50 +0000)
am: c23582e5fb

* commit 'c23582e5fb96c2f9cbef51af5d1591806d7d969d':


Trivial merge