Merge "Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp am: 3732ed29e3"

This commit is contained in:
Android Build Merger (Role)
2017-05-05 12:22:23 +00:00
committed by Android (Google) Code Review

View File

@@ -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;