am 70cd92ca: am 27ad6a99: Merge "Improve calibration and accouting in flush-finish...
authorPyry Haulos <phaulos@google.com>
Tue, 21 Jul 2015 15:38:31 +0000 (15:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Jul 2015 15:38:31 +0000 (15:38 +0000)
* commit '70cd92ca64d274654812104a08afb0d7f4d93036':
  Improve calibration and accouting in flush-finish tests


Trivial merge