am 0c5e2b3f: am dc54a8c7: Merge "API changes for NFC." into gingerbread

* commit '0c5e2b3f1377b3b52c535a1f95899830f5de0347':
  API changes for NFC.
This commit is contained in:
Jeff Hamilton
2011-01-24 14:34:09 -08:00
committed by Android Git Automerger

Diff Content Not Available