diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 21:24:37 -0700 |
commit | 0c0d54637af7109ae22e21a117dba3efdaded4b5 (patch) | |
tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 /res/values-v17 | |
parent | cf51139c6e1d57b57177109f2177edc41edf5bbc (diff) | |
parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
download | android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.gz android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.tar.bz2 android_packages_apps_Trebuchet-0c0d54637af7109ae22e21a117dba3efdaded4b5.zip |
resolved conflicts for merge of 13ef17a3 to mnc-ub-dev
b/22609402
Change-Id: I80699d985088b9b79211284e710e8a6b8b90860b
Diffstat (limited to 'res/values-v17')
-rw-r--r-- | res/values-v17/styles.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml deleted file mode 100644 index 11d2a1f82..000000000 --- a/res/values-v17/styles.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="PagedViewWidgetImageView"> - <item name="android:paddingStart">@dimen/app_widget_preview_padding_left</item> - </style> -</resources> |