Elliott Hughes a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master ...

Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74

2013-06-28 16:41:19 -07:00

..

tech

Update NfcBarcode documentation for Kovio.

2013-03-07 15:04:41 -08:00

ApduList.aidl

…

ApduList.java

…

BeamShareData.aidl

Add direct NDEF push API.

2013-03-26 17:07:37 -07:00

BeamShareData.java

Add direct NDEF push API.

2013-03-26 17:07:37 -07:00

ErrorCodes.java

…

FormatException.java

Rewrite NDEF parsing in Java, clean-up API.

2011-12-19 15:48:35 -08:00

INdefPushCallback.aidl

Add direct NDEF push API.

2013-03-26 17:07:37 -07:00

INfcAdapter.aidl

Added NFC disable during phone shutdown

2012-04-20 12:11:57 -07:00

INfcAdapterExtras.aidl

NfcAdapterExtras: expose driver name.

2012-10-03 14:14:23 -07:00

INfcTag.aidl

Add API for querying extended length APDU support.

2012-04-04 10:43:06 -07:00

NdefMessage.aidl

…

NdefMessage.java

Fix doc bug.

2012-01-27 11:03:05 -08:00

NdefRecord.aidl

…

NdefRecord.java

Switch frameworks/base over from @hidden Charsets to public StandardCharsets.

2013-06-28 16:24:48 -07:00

NfcActivityManager.java

Add direct NDEF push API.

2013-03-26 17:07:37 -07:00

NfcAdapter.java

Add direct NDEF push API.

2013-03-26 17:07:37 -07:00

NfcEvent.java

…

NfcManager.java

am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1

2011-12-22 15:59:34 -08:00

package.html

docs: fix several links

2012-06-22 12:35:08 -07:00

Tag.aidl

…

Tag.java

Fix build.

2012-09-25 09:31:50 -07:00

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…