kopriva d366837e05 Merge "docs: fixed five typos" into pi-dev ...

am: 82b413428e

Change-Id: I4af571d6bcfa151235223b51cb8135fbacb62c82

2018-09-18 12:00:24 -07:00

..

cardemulation

resolve merge conflicts of 92b78539e3 to stage-aosp-master

2018-08-03 11:05:23 +01:00

dta

…

tech

docs: fixed five typos

2018-09-17 15:17:50 -07:00

ApduList.aidl

…

ApduList.java

…

BeamShareData.aidl

…

BeamShareData.java

…

ErrorCodes.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

FormatException.java

…

IAppCallback.aidl

…

INfcAdapter.aidl

…

INfcAdapterExtras.aidl

…

INfcCardEmulation.aidl

…

INfcDta.aidl

…

INfcFCardEmulation.aidl

…

INfcTag.aidl

…

INfcUnlockHandler.aidl

…

ITagRemovedCallback.aidl

…

NdefMessage.aidl

…

NdefMessage.java

…

NdefRecord.aidl

…

NdefRecord.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

NfcActivityManager.java

resolve merge conflicts of 92b78539e3 to stage-aosp-master

2018-08-03 11:05:23 +01:00

NfcAdapter.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

NfcEvent.java

…

NfcManager.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

package.html

…

Tag.aidl

…

Tag.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…