am 7c0df341: (-s ours) am 19064468: Lower correlation threshold in flush-finish tests
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:29 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:29 +0000 (10:45 +0000)
* commit '7c0df341960b49426f37ef5d693c333c935dccd7':


Trivial merge