diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-24 17:18:10 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-04-24 17:18:10 -0700 |
| commit | ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3 (patch) | |
| tree | 77d9d3a96daacf86575bb486ad5ea214e003a90a /packages/Keyguard/src/com/android | |
| parent | 23af77a3cd1febc740d885ff03ead09837df269c (diff) | |
| parent | 02e857441fcc27134f335aee659d553641a2b2ab (diff) | |
| download | frameworks_base-ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3.zip frameworks_base-ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3.tar.gz frameworks_base-ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3.tar.bz2 | |
resolved conflicts for merge of 02e85744 to master
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
Diffstat (limited to 'packages/Keyguard/src/com/android')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java b/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java index 2e4dbdf..ede23ef 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java @@ -27,11 +27,10 @@ import android.os.Looper; import android.os.SystemClock; import android.text.TextUtils; import android.util.AttributeSet; +import android.util.MutableInt; import android.view.View; import android.widget.TextView; -import libcore.util.MutableInt; - import java.lang.ref.WeakReference; import com.android.internal.widget.LockPatternUtils; |