diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 22:06:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-20 22:06:35 +0000 |
| commit | 3f849f410808a0bca039d73fd763825c73d15419 (patch) | |
| tree | a9af0794f210bd49a37148dbb2740469ca327ebe /res/layout/permissions_frame.xml | |
| parent | 786cf97b83a4e502b8683198cdea8872c8507b93 (diff) | |
| parent | ef861375eebd9ac6cce7c0bb163380ab1c951063 (diff) | |
| download | android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.gz android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.bz2 android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
am: ef861375ee
* commit 'ef861375eebd9ac6cce7c0bb163380ab1c951063':
resolve merge conflicts of c10abb25f3 to cw-e-dev.
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> |