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)
commit8167db4730dab225a988d87a8f769dcee9f8c616
tree24002cae96d2478d3b77fc893c656ebfacb48803
parent0474b9448adf220a8f2cf9eeb91f2c1cd5f2c0be
parent80fe30bfae696b0360a3a3c5c59d83c15f773a32
am 80fe30bf: (-s ours) am 27ad6a99: Merge "Improve calibration and accouting in flush-finish tests" into mnc-dev

* commit '80fe30bfae696b0360a3a3c5c59d83c15f773a32':