tree f0c3f94fe57e8a8f0887f2b81c1cfe33c69724b7
parent 1e8f74ebc06cbe6ddb51be009b07a9fa52f6bc3e
parent f3e284a1e03dad8fac8afe97d4634627d80b5d7b
author Nick Pelly <npelly@google.com> 1321938509 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938509 -0800

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

* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk