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

resolved conflicts for merge of 71ab4f4f to master

Browse Source 
Change-Id: I888c231f7579523e12fbd68f820f0775019e51e0
This commit is contained in:
Narayan Kamath
2014-04-02 11:50:57 +01:00
parent fb0873268c 71ab4f4f48
commit b69bb44558
10 changed files with 783 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ import android.view.WindowManager;
import com.android.internal.R;
import com.android.internal.os.BinderInternal;
import com.android.internal.os.Zygote;
import com.android.internal.os.SamplingProfilerIntegration;
import com.android.server.accessibility.AccessibilityManagerService;
import com.android.server.accounts.AccountManagerService;
@@ -83,7 +84,6 @@ import com.android.server.wallpaper.WallpaperManagerService;
import com.android.server.wm.WindowManagerService;
import dalvik.system.VMRuntime;
import dalvik.system.Zygote;
import java.io.File;
import java.util.Timer;