OSDN Git Service

Merge "Offer to measure disk stats using quotas." am: f8720b95be am: 4b80a4a372
authorJeff Sharkey <jsharkey@android.com>
Tue, 3 Jan 2017 19:48:36 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Jan 2017 19:48:36 +0000 (19:48 +0000)
commit7664e6188574a6a10b5dcb70791b15fe3a8c4707
treef26100c0e3abb557406d3f08880070a40bd2cba4
parent5f0dad0e647be543d30904aae38dacc0cf0799f8
parent1e1cdbead134b55301786c85e8fe5ec8776df061
Merge "Offer to measure disk stats using quotas." am: f8720b95be am: 4b80a4a372
am: 1e1cdbead1

Change-Id: Ic00acfb0efb6188a15357322528075d41467310b
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/pm/PackageManagerService.java