Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 304560b8 authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp 

am: 3732ed29

Change-Id: Id5ac6fdf07b28e59b0231359089fcf4a8415ad8f
parents acac2a75 3732ed29

services/core/java/com/android/server/pm/PackageDexOptimizer.java

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; 
import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;



import static com.android.server.pm.PackageManagerService.WATCHDOG_TIMEOUT;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getNonProfileGuidedCompilerFilter;



import static dalvik.system.DexFile.getNonProfileGuidedCompilerFilter;

import static dalvik.system.DexFile.getSafeModeCompilerFilter;