Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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.0 | Brint E. Kriebel | 2014-11-03 | 2 | -0/+55 |
|\ | |||||
| * | Adding MiFARE DESFire format support | Jizhou Liao | 2014-10-29 | 7 | -13/+254 |
| * | Automatic translation import | Michael Bestas | 2014-10-15 | 2 | -0/+55 |
* | | Adding MiFARE DESFire format support | Jizhou Liao | 2014-10-29 | 7 | -13/+254 |
* | | Merge branch 'cm-11.0' into stable/cm-11.0 | Brint E. Kriebel | 2014-09-02 | 4 | -5/+15 |
|\| | |||||
| * | Automatic translation import | Michael Bestas | 2014-08-23 | 4 | -5/+5 |
| * | Automatic translation import | Michael Bestas | 2014-08-09 | 1 | -0/+10 |
* | | Merge branch 'cm-11.0' into stable/cm-11.0 | Brint E. Kriebel | 2014-07-27 | 2 | -1/+40 |
|\| | |||||
| * | Automatic translation import | Michael Bestas | 2014-07-24 | 2 | -1/+40 |
* | | Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505a | Brint E. Kriebel | 2014-06-30 | 6 | -56/+21 |
|\| | |||||
| * | Automatic translation import | Michael Bestas | 2014-06-30 | 1 | -0/+7 |
| * | Automatic translation import | Michael Bestas | 2014-06-22 | 1 | -38/+0 |
| * | Merge tag 'android-4.4.3_r1' into HEAD | Ricardo Cerqueira | 2014-06-03 | 4 | -18/+14 |
| |\ | |||||
| | * | Fix compiler warnings (DO NOT MERGE). | Nick Kralevich | 2014-03-19 | 1 | -2/+2 |
| | * | DO NOT MERGE Fix NPE in RegisteredAidCache | Yuka Anami | 2014-03-14 | 1 | -1/+4 |
| | * | Import translations. DO NOT MERGE | Baligh Uddin | 2014-02-20 | 1 | -1/+1 |
| | * | Import translations. DO NOT MERGE | Baligh Uddin | 2013-12-12 | 1 | -14/+7 |
| * | | nxp: Include support declaration for Mifare tags | Ricardo Cerqueira | 2014-05-30 | 1 | -0/+10 |
* | | | nxp: Include support declaration for Mifare tagscm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea | Ricardo Cerqueira | 2014-05-31 | 1 | -0/+10 |
* | | | Merge remote-tracking branch 'github/cm-11.0' into HEAD | Brint E. Kriebel | 2014-05-22 | 3 | -0/+50 |
|\| | | |||||
| * | | Merge "Nfc : Switch to notification sound" into cm-11.0 | Danesh M | 2014-05-21 | 2 | -12/+4 |
| |\ \ | |||||
| | * | | Nfc : Switch to notification sound | Danesh M | 2014-05-20 | 2 | -12/+4 |
| * | | | Automatic translation import | Michael Bestas | 2014-05-21 | 3 | -0/+50 |
| |/ / | |||||
* / / | Nfc : Switch to notification sound | Danesh M | 2014-05-22 | 2 | -12/+4 |
|/ / | |||||
* | | Merge tag 'android-4.4.1_r1' into HEAD | Ricardo Cerqueira | 2013-12-06 | 9 | -25/+77 |
|\| | |||||
| * | Increase NFC-A guard time to work around B5 issue. | Martijn Coenen | 2013-11-06 | 1 | -0/+29 |
| * | Import translations. DO NOT MERGE | Baligh Uddin | 2013-10-28 | 3 | -14/+14 |
| * | HCE: Fix potential crash and handle Android AID. | Martijn Coenen | 2013-10-23 | 2 | -0/+23 |
| * | Import translations. DO NOT MERGE | Baligh Uddin | 2013-10-21 | 2 | -10/+10 |
| * | Merge "Import translations. DO NOT MERGE" into klp-dev | Baligh Uddin | 2013-10-17 | 1 | -1/+1 |
| |\ | |||||
| | * | Import translations. DO NOT MERGE | Baligh Uddin | 2013-10-17 | 1 | -1/+1 |
| * | | merge in klp-release (no-op) | Ed Heyl | 2013-10-16 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
* | | | Nfc: UG translation. | sahranbay | 2013-11-17 | 1 | -0/+38 |
| |/ |/| | |||||
* | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-13 | 0 | -0/+0 |
|\ \ | |/ |/| | |||||
| * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-10 | 0 | -0/+0 |
| |\ | |||||
| | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-09 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-07 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-06 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-03 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-02 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-01 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-29 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-22 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
* | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2013-10-12 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge "Disable HCE debug logging." into klp-dev | Martijn Coenen | 2013-10-09 | 4 | -28/+80 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Disable HCE debug logging. | Martijn Coenen | 2013-10-09 | 4 | -28/+80 |
| |/ / / / / / / / | |||||
* | | | | | | | | | merge in KFS78N (no-op) | Ed Heyl | 2013-10-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge in klp-factoryrom-release history after reset to klp-release | The Android Automerger | 2013-09-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | merge in KQS81M | Ed Heyl | 2013-10-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ |