am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with...
am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '4fb747f3':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk