summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Brint E. Kriebel2014-11-032-0/+55
|\
| * Adding MiFARE DESFire format supportJizhou Liao2014-10-297-13/+254
| * Automatic translation importMichael Bestas2014-10-152-0/+55
* | Adding MiFARE DESFire format supportJizhou Liao2014-10-297-13/+254
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-09-024-5/+15
|\|
| * Automatic translation importMichael Bestas2014-08-234-5/+5
| * Automatic translation importMichael Bestas2014-08-091-0/+10
* | Merge branch 'cm-11.0' into stable/cm-11.0Brint E. Kriebel2014-07-272-1/+40
|\|
| * Automatic translation importMichael Bestas2014-07-242-1/+40
* | Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aBrint E. Kriebel2014-06-306-56/+21
|\|
| * Automatic translation importMichael Bestas2014-06-301-0/+7
| * Automatic translation importMichael Bestas2014-06-221-38/+0
| * Merge tag 'android-4.4.3_r1' into HEADRicardo Cerqueira2014-06-034-18/+14
| |\
| | * Fix compiler warnings (DO NOT MERGE).Nick Kralevich2014-03-191-2/+2
| | * DO NOT MERGE Fix NPE in RegisteredAidCacheYuka Anami2014-03-141-1/+4
| | * Import translations. DO NOT MERGEBaligh Uddin2014-02-201-1/+1
| | * Import translations. DO NOT MERGEBaligh Uddin2013-12-121-14/+7
| * | nxp: Include support declaration for Mifare tagsRicardo Cerqueira2014-05-301-0/+10
* | | nxp: Include support declaration for Mifare tagscm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2014-05-311-0/+10
* | | Merge remote-tracking branch 'github/cm-11.0' into HEADBrint E. Kriebel2014-05-223-0/+50
|\| |
| * | Merge "Nfc : Switch to notification sound" into cm-11.0Danesh M2014-05-212-12/+4
| |\ \
| | * | Nfc : Switch to notification soundDanesh M2014-05-202-12/+4
| * | | Automatic translation importMichael Bestas2014-05-213-0/+50
| |/ /
* / / Nfc : Switch to notification soundDanesh M2014-05-222-12/+4
|/ /
* | Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-069-25/+77
|\|
| * Increase NFC-A guard time to work around B5 issue.Martijn Coenen2013-11-061-0/+29
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-283-14/+14
| * HCE: Fix potential crash and handle Android AID.Martijn Coenen2013-10-232-0/+23
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-212-10/+10
| * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-171-1/+1
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-10-171-1/+1
| * | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ | | |/ | |/|
* | | Nfc: UG translation.sahranbay2013-11-171-0/+38
| |/ |/|
* | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
|\ \ | |/ |/|
| * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| |\
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-070-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | | |\
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | |\
* | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-121-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge "Disable HCE debug logging." into klp-devMartijn Coenen2013-10-094-28/+80
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Disable HCE debug logging.Martijn Coenen2013-10-094-28/+80
| |/ / / / / / / /
* | | | | | | | | merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge in klp-factoryrom-release history after reset to klp-releaseThe Android Automerger2013-09-160-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ merge in KQS81MEd Heyl2013-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \