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

Merge \\"resolve merge conflicts of f4ad443 to nyc-mr1-dev\\" into nyc-mr1-dev am: b2e2007766

Browse Source 
am: 359c8343dd

Change-Id: If583064958771877190821b66d90974b8e94b692
This commit is contained in:
Jason Monk
2016-06-15 16:52:48 +00:00
committed by android-build-merger
parent 2c1e5b1ba5 359c8343dd
commit 9e560413c6
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 com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.CharSequences;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;