Fix mismerge

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

<!--

/*

**

** Copyright 2013, 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.

*/

-->

<com.android.launcher3.AlphaDisableableButton

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

    style="@style/ActionBarSetWallpaperStyle"

    android:id="@+id/set_wallpaper_button"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingRight="20dp"

    android:drawableLeft="@drawable/ic_actionbar_accept"

    android:drawablePadding="8dp"

    android:gravity="start|center_vertical"

    android:text="@string/lockscreen_wallpaper_instructions">

</com.android.launcher3.AlphaDisableableButton>

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

<!--

     Copyright (C) 2015 The CyanogenMod 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.

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Clear keyguard wallpaper tile text -->

    <string name="clear_keyguard_wallpaper">Clear</string>

    <!-- Button label on LockWallpaper picker screen to set a lockscreen wallpaper -->

    <string name="lockscreen_wallpaper_instructions">Set lock screen wallpaper</string>

</resources>