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

* commit 'eecd033711358895d3226ed8e2296a6aaaf75af6':


Trivial merge