Merge "Allow ephemeral apps to reach any CATEGORY_BROWSABLE"

author Chad Brubaker <cbrubaker@google.com>

Thu, 2 Feb 2017 19:07:56 +0000 (19:07 +0000)

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

Thu, 2 Feb 2017 19:08:00 +0000 (19:08 +0000)
author Chad Brubaker <cbrubaker@google.com>
Thu, 2 Feb 2017 19:07:56 +0000 (19:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 2 Feb 2017 19:08:00 +0000 (19:08 +0000)
diff --cc core/java/android/content/pm/PackageParser.java
Simple merge
author	Chad Brubaker <cbrubaker@google.com>
	Thu, 2 Feb 2017 19:07:56 +0000 (19:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 2 Feb 2017 19:08:00 +0000 (19:08 +0000)