diff options
author | Justin Ho <justinho@google.com> | 2012-01-05 13:05:16 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-05 13:05:16 -0800 |
commit | 9cc201742a70ab0879965d23d2c2b33ee6c18e70 (patch) | |
tree | 1d5efac9e41c39ac7876c146fd03dd71996ef0e2 | |
parent | a5a0fb88861b6ada41bad777f42421cbebd193fd (diff) | |
parent | 730f65142632e212e30c28fe2b89e84d55fb5bc9 (diff) | |
download | Galaxy4-9cc201742a70ab0879965d23d2c2b33ee6c18e70.tar.gz |
Merge "Removing Live Wallpaper Description - Bug 5462731"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r22tools_r21jb-releasejb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devjb-mr0-releasejb-dev
-rw-r--r-- | res/values/strings.xml | 1 | ||||
-rw-r--r-- | res/xml/wallpaper.xml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2dd521b..cbd33ff 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -17,5 +17,4 @@ <resources> <string name="wallpaper_label">Black Hole</string> <string name="wallpaper_author">Google</string> - <string name="wallpaper_description">DESC</string> </resources> diff --git a/res/xml/wallpaper.xml b/res/xml/wallpaper.xml index 71a9574..572063d 100644 --- a/res/xml/wallpaper.xml +++ b/res/xml/wallpaper.xml @@ -19,5 +19,4 @@ <wallpaper xmlns:android="http://schemas.android.com/apk/res/android" android:author="@string/wallpaper_author" - android:description="@string/wallpaper_description" android:thumbnail="@drawable/wallpaper_thumb" /> |