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

* commit '8167db4730dab225a988d87a8f769dcee9f8c616':


Trivial merge