Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev

<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License")

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <include layout="@layout/keyguard_glow_pad_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center" />

</merge>

 No newline at end of file

    <include layout="@layout/keyguard_glow_pad_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center" />

        android:layout_gravity="bottom|center_horizontal"

        android:layout_marginBottom="-96dp"/>

</merge>

 No newline at end of file