am e6028e52: am 02d89898: am a2058e43: Merge change I11c3cdc7 into eclair

Merge commit 'e6028e52c9b66957311d25b6e72a2f683c507a5e'

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