Nathan Harold 41e2d7494f Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed ...

am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e

2018-10-24 16:14:06 -07:00

..

cardemulation

Merge "docs: bug 37128155, broken link" into pi-dev

2018-10-08 23:28:36 -07: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

…

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

…

NfcActivityManager.java

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

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

NfcAdapter.java

…

NfcEvent.java

…

NfcManager.java

Move some members to the "Q blacklist".

2018-10-22 17:28:24 -07:00

package.html

…

Tag.aidl

…

Tag.java

…

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…