Merge "Remove dependency on libcore internal annotation"

This commit is contained in:
Neil Fuller
2018-10-16 20:41:32 +00:00
committed by Android (Google) Code Review

View File

@@ -16,6 +16,7 @@
package com.android.settings.enterprise;
import android.annotation.NonNull;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
@@ -44,8 +45,6 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import libcore.util.NonNull;
import java.util.Objects;
/**