summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk/1.1_r1
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-11-17 17:44:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 17:44:37 -0800
commita8606cf661fde3300165f181c5825cf0535adc66 (patch)
tree21b35ab05260c94fa4cc4fbb978420674f76513a /docs/html/sdk/1.1_r1
parent9da22d2cc31069d86a92021d8540bb5a77c9591b (diff)
parent398f80eacb8e59d868f287bf273a1253fe219ce4 (diff)
downloadframeworks_base-a8606cf661fde3300165f181c5825cf0535adc66.zip
frameworks_base-a8606cf661fde3300165f181c5825cf0535adc66.tar.gz
frameworks_base-a8606cf661fde3300165f181c5825cf0535adc66.tar.bz2
am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '398f80eacb8e59d868f287bf273a1253fe219ce4': Fix 5620754: don't show pattern screen after SIM PUK unlock
Diffstat (limited to 'docs/html/sdk/1.1_r1')
0 files changed, 0 insertions, 0 deletions