merge conflicts CNA#2

Change-Id: I9ca3b1ce4bf27e765ae5ba395de15ea3b256af90
Haxer · Oct 11, 2012 · 1122f48 · 1122f48
1 parent 677968f
commit 1122f48
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -66,8 +66,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fadingEdge="none"
-            android:overScrollMode="always"
-            android:layout_marginTop="@dimen/notification_panel_widget_padding_top">
+            android:overScrollMode="always">
 
             <LinearLayout
                 android:layout_width="match_parent"