am 8167db47: am 80fe30bf: (-s ours) am 27ad6a99: Merge "Improve calibration and accou...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:42 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:42 +0000 (14:46 +0000)
commit887a9db146173aea565b7b23131524c2e0b81df2
treeb52b7861d0b8df4140b55895a04ce5db643760ba
parent82d6ce54c481250eb20e149a4441aec844bf14b4
parent8167db4730dab225a988d87a8f769dcee9f8c616
am 8167db47: am 80fe30bf: (-s ours) am 27ad6a99: Merge "Improve calibration and accouting in flush-finish tests" into mnc-dev

* commit '8167db4730dab225a988d87a8f769dcee9f8c616':