drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of ad2fa35d to master

Browse Source 
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
This commit is contained in:
Tom Taylor
2009-12-22 10:11:55 -08:00
parent fddd8f96f3 ad2fa35d88
commit f0108cda21
35 changed files with 85 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/WallpaperManagerService.java
View File

@ -66,7 +66,7 @@ import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
import com.android.internal.service.wallpaper.ImageWallpaper;
import com.android.internal.util.FastXmlSerializer;
import com.android.common.FastXmlSerializer;
class WallpaperManagerService extends IWallpaperManager.Stub {
static final String TAG = "WallpaperService";