am 27ad6a99: Merge "Improve calibration and accouting in flush-finish tests" into...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:44:13 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:44:13 +0000 (19:44 +0000)
am: 1310968013

* commit '13109680132cbde922c99b85df22f6a7dbba429a':


Trivial merge