Trevor Johns 59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev ...

* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

2016-04-20 18:35:57 +00:00

..

cardemulation

Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev

2016-04-20 18:35:57 +00:00

tech

…

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

…

NdefMessage.aidl

…

NdefMessage.java

…

NdefRecord.aidl

…

NdefRecord.java

…

NfcActivityManager.java

…

NfcAdapter.java

…

NfcEvent.java

…

NfcManager.java

…

package.html

…

Tag.aidl

…

Tag.java

…

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…