Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp
am: 3732ed29e3
Change-Id: Id5ac6fdf07b28e59b0231359089fcf4a8415ad8f
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user