Mathew Inwood 580f86d883 resolve merge conflicts of 92b78539e3 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I6176e760bb0912fd075a36d65fa0b49680c14aa3
Change-Id: I71a17fa603fcd2339bfca54f9e5a7740bc54972f

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

..

cardemulation

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

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

dta

…

tech

…

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

…

package.html

…

Tag.aidl

…

Tag.java

…

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…