resolve merge conflicts of b9d34b38 to master

    <com.android.systemui.qs.NonInterceptingScrollView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">

        android:layout_weight="1"

        android:fillViewport="true">

        <FrameLayout

            android:id="@android:id/content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

            android:layout_height="match_parent"/>

    </com.android.systemui.qs.NonInterceptingScrollView>

    <include layout="@layout/qs_detail_buttons" />

     limitations under the License.

-->

<!-- extends FrameLayout -->

<com.android.systemui.qs.QSDetailItems xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.systemui.qs.QSDetailItems

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

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    <LinearLayout

        android:id="@android:id/empty"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:gravity="center_horizontal"

        android:gravity="center"

        android:orientation="vertical">

        <ImageView

            }

            mItems.setItems(items);

        }

    };

    }

}