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-land | |
| 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-land')
| -rw-r--r-- | res/values-sw720dp-land/dimens.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml index ca13db05b..514980fe0 100644 --- a/res/values-sw720dp-land/dimens.xml +++ b/res/values-sw720dp-land/dimens.xml @@ -15,10 +15,6 @@ --> <resources> -<!-- AppsCustomize --> - <integer name="apps_customize_widget_cell_count_x">4</integer> - <integer name="apps_customize_widget_cell_count_y">2</integer> - <!-- the area at the edge of the screen that makes the workspace go left or right while you're dragging. --> <dimen name="scroll_zone">100dip</dimen> |