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