diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
---|---|---|
committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/values-sw720dp/styles.xml | |
parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/values-sw720dp/styles.xml')
-rw-r--r-- | res/values-sw720dp/styles.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index cbc1e29b3..e8b706e23 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -27,7 +27,7 @@ <item name="android:layout_height">match_parent</item> </style> - <style name="DropTargetButton" parent="DropTargetButton.Base"> + <style name="DropTargetButton" parent="DropTargetButtonBase"> <item name="android:paddingLeft">60dp</item> <item name="android:paddingRight">60dp</item> <item name="android:shadowColor">#393939</item> |