diff options
author | Justin Ho <justinho@google.com> | 2012-01-05 13:05:02 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-05 13:05:02 -0800 |
commit | 7a4c27b82f724eb321b3d44c1042b941e79325d6 (patch) | |
tree | d18b53eae2e7dbecbd308fa7b2169f67fe494430 /res/xml/magicsmoke.xml | |
parent | 2fffdd3089ba8895f5aa2f5adc9d003f493b68d8 (diff) | |
parent | 9c9e7c3d6e70c0326cb05e0656fccb1a5f07f1c6 (diff) | |
download | android_packages_wallpapers_MagicSmoke-7a4c27b82f724eb321b3d44c1042b941e79325d6.tar.gz android_packages_wallpapers_MagicSmoke-7a4c27b82f724eb321b3d44c1042b941e79325d6.tar.bz2 android_packages_wallpapers_MagicSmoke-7a4c27b82f724eb321b3d44c1042b941e79325d6.zip |
Merge "Removing Live Wallpaper Description - Bug 5462731"
Diffstat (limited to 'res/xml/magicsmoke.xml')
-rw-r--r-- | res/xml/magicsmoke.xml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/res/xml/magicsmoke.xml b/res/xml/magicsmoke.xml index f1f5cd2..39135fd 100644 --- a/res/xml/magicsmoke.xml +++ b/res/xml/magicsmoke.xml @@ -3,16 +3,16 @@ /** * Copyright (c) 2009, 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 + * 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 + * 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 + * 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. */ --> @@ -22,7 +22,6 @@ <wallpaper xmlns:android="http://schemas.android.com/apk/res/android" android:author="@string/author" - android:description="@string/magicsmoke_desc" android:thumbnail="@drawable/magicsmoke_thumb" android:settingsActivity="com.android.magicsmoke.MagicSmokeSelector" /> |