Merge "Add UID and Service for Secure Element Application" am: b8b7589531

author Ruchi Kandoi <kandoiruchi@google.com>

Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)

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

Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)
author Ruchi Kandoi <kandoiruchi@google.com>
Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)
committer android-build-merger <android-build-merger@google.com>
Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)
diff --cc core/java/android/content/Context.java
Simple merge
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	Ruchi Kandoi <kandoiruchi@google.com>
	Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)
		1	2
core/java/android/content/Context.java	patch \|	diff1 \|	diff2 \|	blob \| history
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