Merge "Revert "Don't call cancel discovery when its already canceelled.""

This commit is contained in:
Jake Hamby 2010-11-19 16:53:26 -08:00 committed by Android (Google) Code Review
commit e27be5d088

Diff Content Not Available