diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:00:11 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:02:19 -0800 |
| commit | ef861375eebd9ac6cce7c0bb163380ab1c951063 (patch) | |
| tree | 870ae89605e49658de3e5abca2797b68c5efbb26 /res/layout/preference_permissions.xml | |
| parent | 9c78316fe6baa4f7fd7d5108349ecf8a2532b047 (diff) | |
| download | android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.gz android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.bz2 android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
Diffstat (limited to 'res/layout/preference_permissions.xml')
| -rw-r--r-- | res/layout/preference_permissions.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/preference_permissions.xml b/res/layout/preference_permissions.xml index 67b4469c..631d56bd 100644 --- a/res/layout/preference_permissions.xml +++ b/res/layout/preference_permissions.xml @@ -37,7 +37,7 @@ android:paddingEnd="20dp" android:paddingTop="4dp" android:paddingBottom="4dp"> - <com.android.internal.widget.PreferenceImageView + <com.android.packageinstaller.permission.ui.PreferenceImageView android:id="@android:id/icon" android:layout_width="24dp" android:layout_height="24dp" |