am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before...
am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'ea58d1ba'
* commit 'ea58d1ba':
Wait for initial device scan to finish before updating config.