am 7a97ad42: Merge "Fix soft Ap handling on system restart" into honeycomb
am 7a97ad42: Merge "Fix soft Ap handling on system restart" into honeycomb

* commit '7a97ad421b50208dc2f484cc23fa3bb29331a713':
  Fix soft Ap handling on system restart

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