am 46e38079: am c602187e: Merge "Prevent scanning during DHCP process"
am 46e38079: am c602187e: Merge "Prevent scanning during DHCP process"

* commit '46e380795216c58acbd38af532ac1626e105866a':
  Prevent scanning during DHCP process

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base