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

* commit '4b173c0d8c168372c0056849cddc932328a6fdd5':
  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