OSDN Git Service

Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev
authorSudheer Shanka <sudheersai@google.com>
Fri, 19 Jun 2015 09:25:55 +0000 (09:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 19 Jun 2015 09:25:59 +0000 (09:25 +0000)
commita408061cc7b5efaf090ce9efd5fd0ba1d95e9c11
tree17c2c65877e214b6c0f68aabddf97544f7bf2d29
parentcb8bb3900178c126b9f101e84edd07bb6b489637
parent9ded760f6378b79ae5f91fe694744981a4154d0b
Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev
core/java/com/android/internal/app/ChooserActivity.java
core/java/com/android/internal/app/ResolverActivity.java
services/core/java/com/android/server/pm/PackageManagerService.java