summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-09-21 18:56:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-21 18:56:47 -0700
commit19662a6a084878bf1b408de29d3dd26199756d0d (patch)
treeb3fd9d3f066c205b19ffa39a15cfdc702ee60b24 /policy/src/com/android
parentc3e4454fdb57391c8d7c77a9d61381d0f4d857e8 (diff)
parent27b402abe5c24a3e21a39458541001ea91465b8f (diff)
downloadframeworks_base-19662a6a084878bf1b408de29d3dd26199756d0d.zip
frameworks_base-19662a6a084878bf1b408de29d3dd26199756d0d.tar.gz
frameworks_base-19662a6a084878bf1b408de29d3dd26199756d0d.tar.bz2
am 27b402ab: Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
* commit '27b402abe5c24a3e21a39458541001ea91465b8f': Set enable_puk_unlock_screen true by default.
Diffstat (limited to 'policy/src/com/android')
0 files changed, 0 insertions, 0 deletions