tree 9816b9efb32053de4d25c89e3951397a6c337b83
parent 8d1eeb2144945365cae281552bd7bc5eb14f7688
parent a2058e431736810503bc85fadec31a8e0bfcad95
author Wink Saville <wink@google.com> 1256755327 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256755327 -0700

am a2058e43: Merge change I11c3cdc7 into eclair

Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2

* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.