Skip to content

GitLab

Switch branch/tag
History Find file
Clone
Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am:...
The Android Open Source Project authored 
Reconcile with jb-mr0-release am: 29b858a5 am: 24810962 am: 37d9ace7 am: a7d4ead2 am: 38c77c14 am: 80fa64f3 am: 27602cef
am: 921fe1ae

* commit '921fe1ae':
29c75386
Name Last commit Last update
assets Updated FireflyRenderThread to be more subtle and depthy.
etc Implement static white-list access control for NFC-EE.
nci Fix compiler warnings (DO NOT MERGE).
nxp Increase reader mode pull duration.
res Import translations. DO NOT MERGE
src/com/android/nfc HCE: Stop routing AIDs for non-default payment services.
tests am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
Android.mk Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES
AndroidManifest.xml Add BLUETOOTH_PRIVILEGED permission.
CleanSpec.mk Replace vendor specific NfcGoogle.apk with generic Nfc.apk
migrate_nfc.txt Replace vendor specific NfcGoogle.apk with generic Nfc.apk