PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of f4ad443 to nyc-mr1-dev

Browse Source 
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
This commit is contained in:
Jason Monk
2016-06-15 11:31:14 -04:00
parent f04499b2e1 f4ad4434f1
commit 90bde71e20
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -26,6 +26,7 @@ import android.os.UserManager;
import android.util.Log; import android.util.Log;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.CharSequences;
import com.android.settings.ChooseLockGeneric; import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R; import com.android.settings.R;