diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-12 13:13:30 -0700 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2012-03-12 13:13:30 -0700 |
| commit | aafb404d330f7b9a4617154b6a7c287a305858b5 (patch) | |
| tree | e897f732c8fbb5da9a7ce246bb97760563972029 /res/values | |
| parent | 31cc305c352206e2ff70fe28f07947ac40055a21 (diff) | |
| parent | 80401e59f82f63ae827d1789aec47b20bba0e1e1 (diff) | |
| download | android_packages_apps_Calendar-aafb404d330f7b9a4617154b6a7c287a305858b5.tar.gz android_packages_apps_Calendar-aafb404d330f7b9a4617154b6a7c287a305858b5.tar.bz2 android_packages_apps_Calendar-aafb404d330f7b9a4617154b6a7c287a305858b5.zip | |
resolved conflicts for merge of 80401e59 to master
Change-Id: Ic6fa9db0067c4a566650fb6e25f04f3b255117dc
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/dimens.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 23a5b8a7..2d9d493d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -44,4 +44,5 @@ <dimen name="event_info_text_size">14dip</dimen> <dimen name="event_info_desc_margin_left">0dip</dimen> <dimen name="event_info_desc_margin_right">0dip</dimen> + <dimen name="event_info_padding">0dip</dimen> </resources> |