am fecc5f06: am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
am fecc5f06: am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread

Merge commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e'

* commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e':
  Add a RHS status bar slot for NFC.

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