am 288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev

author Christopher Tate <ctate@google.com>

Tue, 14 Jul 2015 00:59:52 +0000 (00:59 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Tue, 14 Jul 2015 00:59:52 +0000 (00:59 +0000)
author Christopher Tate <ctate@google.com>
Tue, 14 Jul 2015 00:59:52 +0000 (00:59 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 00:59:52 +0000 (00:59 +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>
	Tue, 14 Jul 2015 00:59:52 +0000 (00:59 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 14 Jul 2015 00:59:52 +0000 (00:59 +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