tree 5a9868e88f54b32a4a3986a4e021911e809257f2
parent b5b4e66b2770c4ab5ef3b68e52f97417725847af
parent ba70e3363675b5cfe7a79bcb2c883df948a43d4b
author John Wang <johnwang@google.com> 1316644359 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316644359 -0700

Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom