am 80fe30bf: (-s ours) am 27ad6a99: Merge "Improve calibration and accouting in flush...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:48:26 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:48:26 +0000 (19:48 +0000)
am: cec941d49d

* commit 'cec941d49db6283b23b54f4fa48ac03c339c8776':


Trivial merge