am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1

* commit '694b266e0366e5400d577659d1bb8152f0a106e7':
  Fix tethering interaction from wifi

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