Merge "Fix intent filter priorities" into nyc-dev

author Todd Kennedy <toddke@google.com>

Mon, 4 Apr 2016 14:20:15 +0000 (14:20 +0000)

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

Mon, 4 Apr 2016 14:20:17 +0000 (14:20 +0000)
author Todd Kennedy <toddke@google.com>
Mon, 4 Apr 2016 14:20:15 +0000 (14:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 4 Apr 2016 14:20:17 +0000 (14:20 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Todd Kennedy <toddke@google.com>
	Mon, 4 Apr 2016 14:20:15 +0000 (14:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 4 Apr 2016 14:20:17 +0000 (14:20 +0000)