Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978

author Todd Kennedy <toddke@google.com>

Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)
author Todd Kennedy <toddke@google.com>
Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)
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
author	Todd Kennedy <toddke@google.com>
	Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 8 Jun 2017 05:52:09 +0000 (05:52 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history