Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev

author Svetoslav <svetoslavganov@google.com>

Tue, 30 Jun 2015 00:49:06 +0000 (00:49 +0000)

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

Tue, 30 Jun 2015 00:49:16 +0000 (00:49 +0000)
author Svetoslav <svetoslavganov@google.com>
Tue, 30 Jun 2015 00:49:06 +0000 (00:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 30 Jun 2015 00:49:16 +0000 (00:49 +0000)
diff --cc services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Svetoslav <svetoslavganov@google.com>
	Tue, 30 Jun 2015 00:49:06 +0000 (00:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 30 Jun 2015 00:49:16 +0000 (00:49 +0000)
		1	2
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history