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

am: 7664e61885

Change-Id: I91c0810aad2ec530650855bcd2f1d25c309717a1

diff --cc core/java/android/app/ContextImpl.java
Simple merge

diff --cc core/java/android/os/Build.java
Simple merge

diff --cc core/java/android/os/UserHandle.java
Simple merge

diff --cc services/core/java/com/android/server/EventLogTags.logtags
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge