tree f26100c0e3abb557406d3f08880070a40bd2cba4
parent 5f0dad0e647be543d30904aae38dacc0cf0799f8
parent 1e1cdbead134b55301786c85e8fe5ec8776df061
author Jeff Sharkey <jsharkey@android.com> 1483472916 +0000
committer android-build-merger <android-build-merger@google.com> 1483472916 +0000

Merge "Offer to measure disk stats using quotas." am: f8720b95be am: 4b80a4a372
am: 1e1cdbead1

Change-Id: Ic00acfb0efb6188a15357322528075d41467310b