am 80fe30bf: (-s ours) am 27ad6a99: Merge "Improve calibration and accouting in flush...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:40 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:40 +0000 (10:45 +0000)
* commit '80fe30bfae696b0360a3a3c5c59d83c15f773a32':


Trivial merge