am 5343f5a8: (-s ours) am 3591bebd: Merge "Restore Wi-Fi configuration after...
am 5343f5a8: (-s ours) am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
* commit '5343f5a8':
Restore Wi-Fi configuration after the test. DO NOT MERGE