Martijn Coenen 5832df526f Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc ...

am: 68b426a30d

* commit '68b426a30d964295360f32defc2b66e6b7247a93':
  Adddress NFC API review comments.

Change-Id: I00acef221305c4cb7aea75c842c1a758cccfb953

2016-05-17 18:39:50 +00:00

..

cardemulation

Merge "Adddress NFC API review comments." into nyc-dev

2016-05-17 18:33:09 +00:00

tech

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

ApduList.aidl

…

ApduList.java

…

BeamShareData.aidl

…

BeamShareData.java

…

ErrorCodes.java

…

FormatException.java

…

IAppCallback.aidl

…

INfcAdapter.aidl

…

INfcAdapterExtras.aidl

…

INfcCardEmulation.aidl

…

INfcFCardEmulation.aidl

…

INfcTag.aidl

…

INfcUnlockHandler.aidl

…

ITagRemovedCallback.aidl

…

NdefMessage.aidl

…

NdefMessage.java

…

NdefRecord.aidl

…

NdefRecord.java

…

NfcActivityManager.java

…

NfcAdapter.java

Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc

2016-05-17 18:39:50 +00:00

NfcEvent.java

…

NfcManager.java

…

package.html

…

Tag.aidl

…

Tag.java

…

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…