am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0

* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
  Remove NfcFragment from activity when no longer sharing.

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