Martijn Coenen 68b426a30d Merge "Adddress NFC API review comments." into nyc-dev ...

am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ic36b9392b9475590ba8f75b352d05fba52b1ee02

2016-05-17 18:33:09 +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

Adddress NFC API review comments.

2016-05-17 09:09:15 +02:00

NfcEvent.java

…

NfcManager.java

…

package.html

…

Tag.aidl

…

Tag.java

…

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…