OSDN Git Service

DO NOT MERGE Fix intent filter priorities am: 60351d3
authorTodd Kennedy <toddke@google.com>
Mon, 11 Apr 2016 22:06:38 +0000 (22:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Apr 2016 22:06:38 +0000 (22:06 +0000)
commitca133845ef815d7cc1f036b1355130a8a867a98c
treed96d624716ad6253947a912cd9b54892eff4c93e
parent58048c1f17d54166c6a048af2365d17dd32f4d57
parent3dfc6d986f6142b1e0020c9970f626c7c435711e
DO NOT MERGE Fix intent filter priorities am: 60351d3
am: 3dfc6d9

* commit '3dfc6d986f6142b1e0020c9970f626c7c435711e':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Id396cca79db8f830a513746f387fb866c773c778
services/core/java/com/android/server/IntentResolver.java
services/core/java/com/android/server/pm/PackageManagerService.java