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

resolved conflicts for merge of 301b97ac to eclair

Browse Source 
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48
This commit is contained in:
Dianne Hackborn
2009-08-27 12:26:44 -07:00
parent 4d5b4225e4 301b97ac19
commit 6ccd2aff3e
5 changed files with 156 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/SystemServer.java
View File

@@ -19,7 +19,6 @@ package com.android.server;
import com.android.server.am.ActivityManagerService;
import com.android.server.status.StatusBarService;
import dalvik.system.PathClassLoader;
import dalvik.system.VMRuntime;
import android.app.ActivityManagerNative;
@@ -42,9 +41,6 @@ import android.util.EventLog;
import android.util.Log;
import android.accounts.AccountManagerService;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
class ServerThread extends Thread {
private static final String TAG = "SystemServer";
private final static boolean INCLUDE_DEMO = false;