[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity()...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityStarter.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityStarter.java	patch \|	diff1 \|	diff2 \|	blob \| history