tree 059dddb9f526e4ddf5eb4b624e8c86ff8ce168f1
parent b921b37b1c112145788a080a0e7ae33525afd7b5
parent 070237771e89bbf027ed85302df7a91fae0fa5c2
author Daniel Sandler <dsandler@android.com> 1270733603 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270733603 -0700

am 07023777: am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo

Merge commit '070237771e89bbf027ed85302df7a91fae0fa5c2' into kraken

* commit '070237771e89bbf027ed85302df7a91fae0fa5c2':
  Add emergency call button to PUK'd lockscreen.