diff options
author | Jim Miller <jaggies@google.com> | 2011-11-09 15:19:31 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-09 15:19:31 -0800 |
commit | 270826a8878b5470d48d93ca3d518ac93860870d (patch) | |
tree | 3268e5f0312f4b184fe73073cce08af4e9b310f9 /core/java/android/widget/TextView.java | |
parent | 6b992090f6eb1e14553be22373799258bb401e3d (diff) | |
parent | 1f56edc6cd377eab05d9816e93591a7139cdff96 (diff) | |
download | frameworks_base-270826a8878b5470d48d93ca3d518ac93860870d.zip frameworks_base-270826a8878b5470d48d93ca3d518ac93860870d.tar.gz frameworks_base-270826a8878b5470d48d93ca3d518ac93860870d.tar.bz2 |
Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions