[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...

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

Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)

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

Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc packages/SystemUI/AndroidManifest.xml
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SystemUI/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history