summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix misc-macro-parentheses warnings in apps/Nfc."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Chih-hung Hsieh2016-07-071-1/+1
|\
| * Fix misc-macro-parentheses warnings in apps/Nfc.Chih-Hung Hsieh2016-06-301-1/+1
|/
* Merge "nfc: Clock up temporarily when doing NFC payment transaction"Treehugger Robot2016-06-242-0/+13
|\
| * nfc: Clock up temporarily when doing NFC payment transactionles_lee2016-06-242-0/+13
* | Merge "Fix HCE can't handle last empty I-block of a chain"Treehugger Robot2016-06-241-8/+8
|\ \ | |/ |/|
| * Fix HCE can't handle last empty I-block of a chainJizhou Liao2016-06-201-8/+8
|/
* Merge "Fix misc-macro-parentheses warnings."android-wear-n-preview-1android-n-preview-4android-n-preview-3Martijn Coenen2016-05-132-5/+5
|\
| * Fix misc-macro-parentheses warnings.Chih-Hung Hsieh2016-05-122-5/+5
|/
* Merge "Allow foreground override in provision mode."android-n-preview-2Martijn Coenen2016-03-301-11/+11
|\
| * Allow foreground override in provision mode.Martijn Coenen2016-03-301-11/+11
* | Merge "Don't allow receiving files in provision mode."Martijn Coenen2016-03-301-15/+18
|\|
| * Don't allow receiving files in provision mode.Martijn Coenen2016-03-301-15/+18
* | Merge "Don't disable NFC in airplane mode."Martijn Coenen2016-03-291-59/+1
|\|
| * Don't disable NFC in airplane mode.Martijn Coenen2016-03-291-59/+1
* | Merge "Fix all the warnings in packages/apps/Nfc/nci/jni."Aurimas Liutikas2016-02-298-20/+14
|\ \
| * \ Merge "Fix all the warnings in packages/apps/Nfc/nci/jni."android-n-preview-1Aurimas Liutikas2016-02-298-20/+14
| |\ \
| | * | Fix all the warnings in packages/apps/Nfc/nci/jni.Aurimas Liutikas2016-02-268-20/+14
| |/ /
* | | Import translations. DO NOT MERGEBaligh Uddin2016-02-2314-42/+85
* | | Merge commit '620f2cb3db26ea70157f23f3308307a91bd7ef39' into HEADBill Yi2016-02-179-19/+19
|\ \ \ | |/ / |/| |
| * | Merge "Treat more as a UINT8 like it should be." am: 231a310a99Martijn Coenen2015-11-252-2/+2
| |\ \
| * \ \ Import translations. DO NOT MERGEBaligh Uddin2015-11-050-0/+0
| |\ \ \
* | \ \ \ Merge "Add optional OOB data processing for LE devices"Andre Eisenbach2016-02-044-7/+46
|\ \ \ \ \
| * | | | | Add optional OOB data processing for LE devicesJakub Pawlowski2016-02-034-7/+46
|/ / / / /
* | | | | Merge "Fix Mifare Classic semaphore issue"Martijn Coenen2016-01-251-0/+2
|\ \ \ \ \
| * | | | | Fix Mifare Classic semaphore issueJizhou Liao2015-11-061-0/+2
* | | | | | Merge "Implementation of HCE for NFC-F."Martijn Coenen2016-01-2513-94/+2397
|\ \ \ \ \ \
| * | | | | | Implementation of HCE for NFC-F.Yoshinobu Ito2016-01-2213-94/+2397
| | |_|_|/ / | |/| | | |
* | | | | | Merge "Handle invalid handover URI"Martijn Coenen2016-01-251-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Handle invalid handover URIfang.x.chen2016-01-221-1/+7
|/ / / / /
* | | | | Merge "Treat more as a UINT8 like it should be."Martijn Coenen2015-11-252-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Merge "Treat more as a UINT8 like it should be."Martijn Coenen2015-11-252-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Treat more as a UINT8 like it should be.Martijn Coenen2015-11-242-2/+2
| |/ /
* | / Import translations. DO NOT MERGEBaligh Uddin2015-11-049-19/+19
| |/ |/|
* | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
|\ \
| * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.5-releasemarshmallow-dr1.5-devThe Android Open Source Project2015-10-200-0/+0
| |\ \
| | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | |\ \
| | | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...android-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-devThe Android Open Source Project2015-10-200-0/+0
| | | |\ \
| | | | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | |\ \
| | | | | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | |\ \
| | | | | | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | | |\ \
| | | | | | | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | | | |\ \
| | | | | | | | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ Merge branch 'klp-modular-dev' of /usr/local/google/game/mirror/googleplex-an...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | | | | |\ \
* | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | |\| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-07 06:41:48 +0000