Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0d23b82b: Fix 0%^&%!! SDK build.

Browse Source 
Merge commit '0d23b82be2176e4beaa462bd50ff577819651b87' into eclair-plus-aosp

* commit '0d23b82be2176e4beaa462bd50ff577819651b87':
  Fix $#%^&%!! SDK build.
This commit is contained in:
Dianne Hackborn
2009-09-08 13:41:35 -07:00
committed by Android Git Automerger
parent da2e19c6ad 0d23b82be2
commit c66e685115
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/attrs.xml
View File

@@ -3416,7 +3416,8 @@
referenced from its referenced from its
{@link android.service.wallpaper.WallpaperService#SERVICE_META_DATA} {@link android.service.wallpaper.WallpaperService#SERVICE_META_DATA}
meta-data entry. Described here are the attributes that can be meta-data entry. Described here are the attributes that can be
included in that tag. --> included in that tag.
@hide Live Wallpaper -->
<declare-styleable name="Wallpaper"> <declare-styleable name="Wallpaper">
<!-- Component name of an activity that allows the user to modify <!-- Component name of an activity that allows the user to modify
the current settings for this wallpaper. --> the current settings for this wallpaper. -->