OSDN Git Service

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 2 Dec 2016 18:10:04 +0000 (18:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Dec 2016 18:10:16 +0000 (18:10 +0000)
commit6b89229d1475e7791318caed5b2063c49ed99744
treeb1faf9e62850c26205d30f9fd08ea27939121756
parent704085119db359d2e1d6f04600ac7ff2a0ec83e9
parent91add43ae7d31d9f2ccd9a2e7a692289ea4d258f
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
services/core/java/com/android/server/am/ActivityManagerService.java