OSDN Git Service

Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
authorTodd Kennedy <toddke@google.com>
Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)
commitb524ada719c1be84781f4ffa1a29af08e61e6574
tree7ba78beac78aa96237a683d44b4df45036969481
parentc5deced1d8f2713e04f24c4badec65674c53b06e
parentddb322a0005548baf998bd4be90ec492ca7dd894
Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
am: ddb322a000

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