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/permissions_frame.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/permissions_frame.xml')
-rw-r--r-- | res/layout/permissions_frame.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/permissions_frame.xml b/res/layout/permissions_frame.xml index 8f1f2789..156af57e 100644 --- a/res/layout/permissions_frame.xml +++ b/res/layout/permissions_frame.xml @@ -30,8 +30,8 @@ android:layout_height="match_parent" android:text="@string/no_permissions" android:gravity="center" - android:textAppearance="@android:style/TextAppearance.Large" - /> + style="?android:attr/textAppearanceLarge"> + </TextView> </FrameLayout> |