Merge "Use a framework resource to name a factory-default browser app" into mnc-dev

author Christopher Tate <ctate@google.com>

Fri, 26 Jun 2015 21:05:26 +0000 (21:05 +0000)

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

Fri, 26 Jun 2015 21:05:27 +0000 (21:05 +0000)
author Christopher Tate <ctate@google.com>
Fri, 26 Jun 2015 21:05:26 +0000 (21:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 26 Jun 2015 21:05:27 +0000 (21:05 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/pm/Settings.java
Simple merge
author	Christopher Tate <ctate@google.com>
	Fri, 26 Jun 2015 21:05:26 +0000 (21:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 26 Jun 2015 21:05:27 +0000 (21:05 +0000)
		1	2
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history