diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-25 16:08:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-25 16:08:43 +0000 |
| commit | 6a885ba4a01938e9f836ec04f861025ab49abb9b (patch) | |
| tree | 0be147b0de7145d6d81d2eb574299e8dc754b351 /packages/Keyguard | |
| parent | 8e5933dbc4cb9837989da74ed1ac16f7d19c7e28 (diff) | |
| parent | ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3 (diff) | |
| download | frameworks_base-6a885ba4a01938e9f836ec04f861025ab49abb9b.zip frameworks_base-6a885ba4a01938e9f836ec04f861025ab49abb9b.tar.gz frameworks_base-6a885ba4a01938e9f836ec04f861025ab49abb9b.tar.bz2 | |
am ccec5f0d: resolved conflicts for merge of 02e85744 to master
* commit 'ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3':
Use the suggested public API instead of libcore.os.
Diffstat (limited to 'packages/Keyguard')
| -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; |