Merge "Allow phone UID to export singleton providers" into lmp-dev

author Amith Yamasani <yamasani@google.com>

Tue, 5 Aug 2014 23:04:21 +0000 (23:04 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 5 Aug 2014 00:19:02 +0000 (00:19 +0000)
author Amith Yamasani <yamasani@google.com>
Tue, 5 Aug 2014 23:04:21 +0000 (23:04 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 5 Aug 2014 00:19:02 +0000 (00:19 +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	Amith Yamasani <yamasani@google.com>
	Tue, 5 Aug 2014 23:04:21 +0000 (23:04 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 5 Aug 2014 00:19:02 +0000 (00:19 +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