| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22 | Steve Kondik | 2016-03-10 | 8 | -15/+15 |
| |\ | |||||
| | * | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | |\ | |||||
| | * | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | |\| | | |||||
| | | * | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | |\ \ | |||||
| | * | | | | am f08a81c4: Merge "Don\'t enable reader mode when NFC is disabled." into mnc... | Martijn Coenen | 2015-10-19 | 1 | -0/+4 |
| | |\| | | | |||||
| | | * | | | Merge "Don\'t enable reader mode when NFC is disabled." into mnc-dr-dev | Martijn Coenen | 2015-10-19 | 1 | -0/+4 |
| | | |\ \ \ | |||||
| | * | | | | | am a590e214: am e208aeb6: Use global all-cpp-files-under | Dan Willemsen | 2015-10-14 | 1 | -12/+1 |
| | |\| | | | | |||||
| | | * | | | | am e208aeb6: Use global all-cpp-files-under | Dan Willemsen | 2015-10-14 | 1 | -12/+1 |
| | | |\ \ \ \ | |||||
| | * | | | | | | am faea766f: (-s ours) am 30931b14: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-25 | 0 | -0/+0 |
| | |\| | | | | | |||||
| | | * | | | | | am 30931b14: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-25 | 0 | -0/+0 |
| | | |\ \ \ \ \ | |||||
| | * | | | | | | | am 405f1723: am 8415fed4: Grant WiFi override permission to NFC process. | Martijn Coenen | 2015-09-23 | 1 | -0/+1 |
| | |\| | | | | | | |||||
| | | * | | | | | | am 8415fed4: Grant WiFi override permission to NFC process. | Martijn Coenen | 2015-09-23 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | am 899ca873: (-s ours) am aa7adaeb: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-19 | 0 | -0/+0 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | am aa7adaeb: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-19 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | am 8c9730a8: am 8605731e: Support Mifare Classic tag. | Jizhou Liao | 2015-08-31 | 28 | -44/+15050 |
| | |\| | | | | | | | | |||||
| | | * | | | | | | | | am 8605731e: Support Mifare Classic tag. | Jizhou Liao | 2015-08-31 | 28 | -44/+15050 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | am ac4db9ce: am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC ... | Martijn Coenen | 2015-08-24 | 1 | -1/+1 |
| | |\| | | | | | | | | | |||||
| | | * | | | | | | | | | am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC off. | Martijn Coenen | 2015-08-24 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | am e66316f6: am c5eec3c6: Fix peer-to-peer server register error if RF discov... | Jizhou Liao | 2015-08-24 | 2 | -0/+29 |
| | |\| | | | | | | | | | | |||||
| | | * | | | | | | | | | | am c5eec3c6: Fix peer-to-peer server register error if RF discovery is started. | Jizhou Liao | 2015-08-24 | 2 | -0/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | am c132ac72: am fbbf1131: Support Mifare DESFire tag format | Jizhou Liao | 2015-08-24 | 3 | -5/+94 |
| | |\| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | am fbbf1131: Support Mifare DESFire tag format | Jizhou Liao | 2015-08-24 | 3 | -5/+94 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | am 3e88d804: am 26e1bc78: Fix conflict vendor proprietary definitions. | Jizhou Liao | 2015-08-03 | 2 | -240/+215 |
| | |\| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | am 26e1bc78: Fix conflict vendor proprietary definitions. | Jizhou Liao | 2015-08-03 | 2 | -240/+215 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | am 3ddd88c5: am b896d429: am 79458517: Fix NFC onManualBeamInvoke issue with ... | Alex Chau | 2015-07-29 | 1 | -0/+3 |
| | |\| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | am b896d429: am 79458517: Fix NFC onManualBeamInvoke issue with policy | Alex Chau | 2015-07-29 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | am 363a666a: am c336a8c4: Merge "Reset P2P flag in de-initialization." into m... | Martijn Coenen | 2015-07-29 | 1 | -0/+1 |
| | |\| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | am c336a8c4: Merge "Reset P2P flag in de-initialization." into mnc-dr-dev | Martijn Coenen | 2015-07-29 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | am d02b61c3: am d1618c0a: am 0fdfe750: Use a foreground priority broadcast to... | Nicolas Prevot | 2015-07-24 | 1 | -0/+1 |
| | |\| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | am d1618c0a: am 0fdfe750: Use a foreground priority broadcast to hand over da... | Nicolas Prevot | 2015-07-24 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | am 1283f4b0: (-s ours) am e3263602: (-s ours) am b7a8d179: (-s ours) Import t... | Geoff Mendal | 2015-07-15 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | am e3263602: (-s ours) am b7a8d179: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-15 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | am 3da480ef: (-s ours) am 3c476dbc: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-13 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | am 3c476dbc: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-13 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Automatic translation import | Michael Bestas | 2016-03-05 | 13 | -0/+504 |
| * | | | | | | | | | | | | | | | | | | | | nfc: Make unknown protocol logs useful | Pat Erley | 2016-02-10 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/pac... | Steve Kondik | 2015-12-07 | 2 | -12/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'klp-modular-dev' of /usr/local/google/game/mirror/googleplex-an... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | |||||
 |
index : android_packages_apps_Nfc | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |