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

resolved conflicts for merge of f7b79151 to master

Browse Source 
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
This commit is contained in:
Joe Onorato
2010-06-09 15:07:16 -07:00
parent 1d46191d88 f7b7915192
commit 8a5f10b30d
27 changed files with 231 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,10 +16,9 @@
package com.android.server;
import com.android.server.am.ActivityManagerService;
import com.android.internal.os.BinderInternal;
import com.android.internal.os.SamplingProfilerIntegration;
import com.android.server.am.ActivityManagerService;
import com.android.server.status.StatusBarManagerService;
import dalvik.system.VMRuntime;
import dalvik.system.Zygote;