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

* commit '33a434f94a4780e6a7657be79f36b909f6a1d61c':


Trivial merge