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

resolved conflicts for merge of ebe661c4 to master

Browse Source 
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
This commit is contained in:
Jae Seo
2014-06-03 10:03:46 -07:00
parent 5e9a42588e 3c784d6359
commit 4c9e57f156
30 changed files with 240 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.media.AudioService;
import android.media.tv.TvInputManager;
import android.os.Build;
import android.os.Environment;
import android.os.FactoryTest;
@ -43,7 +44,6 @@ import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.service.dreams.DreamService;
import android.tv.TvInputManager;
import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.Log;