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

…

INdefPushCallback.aidl

Add direct NDEF push API.

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

INfcAdapter.aidl

…

INfcAdapterExtras.aidl

…

INfcTag.aidl

…

NdefMessage.aidl

…

NdefMessage.java

…

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

…

package.html

…

Tag.aidl

…

Tag.java

…

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…