Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev

Author: Brian Colonna

core/res/res/layout/keyguard_screen_unlock_portrait.xml

@@ -173,12 +173,11 @@
     <RelativeLayout
         android:id="@+id/faceLockAreaView"
         android:visibility="invisible"
-        android:layout_row="3"
+        android:layout_row="4"
         android:layout_column="0"
-        android:layout_rowSpan="2"
+        android:layout_rowSpan="1"
         android:layout_columnSpan="1"
         android:layout_gravity="fill"
-        android:layout_marginTop="4dip"
         android:layout_marginBottom="4dip"
         android:layout_width="0dip"
         android:layout_height="0dip"