tree 88f3e8998d723988638af453d50a2025fd029b03
parent c96d2aeed70f930d26236a20f6d32f0a24d83bd8
parent f9c1fcc505d59fd87392e6af7341b1737f186081
author Nick Pelly <npelly@google.com> 1321920327 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321920327 -0800

am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

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