am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0

* commit 'b288f99334348a21ffb465b37a4522998b452410':
  Fix disableForegroundNdefPush crash.

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