Merge "Improve calibration and accouting in flush-finish tests" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Tue, 21 Jul 2015 14:26:57 +0000 (14:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jul 2015 14:26:58 +0000 (14:26 +0000)

Trivial merge