summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-3018-0/+764
* Nfc: read extra properties of Mifare ClassicHamster Tian2016-12-301-0/+11
* Revert "Stop building NXP stack."Bruno Martins2016-12-303-6/+25
* Merge b516b5681783ea38a834d77fc02926737472076f on remote branchLinux Build Service Account2016-12-1512-62/+119
|\
| * Merge N-MR1 to remoteLalit Kansara2016-12-0612-62/+119
|/|
| * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-010-0/+0
| |\
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | |\
| | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-170-0/+0
| | | |\
| | | | * Allow for ignore() to work with random UID tags.Martijn Coenen2016-08-111-31/+43
| * | | | Don't dispatch tags when NDEF read times out.Martijn Coenen2016-08-313-14/+3
| |\ \ \ \
| | * | | | Don't dispatch tags when NDEF read times out.Martijn Coenen2016-08-313-14/+3
| * | | | | Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-230-0/+0
| |\| | | | | | |/ / / | |/| | |
| | * | | Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-221-8/+1
| | |/ /
| * / / Fix Bluetooth OOB data parsingJakub Pawlowski2016-08-191-8/+1
| |/ /
| * | Fix Tron stats reporting.Martijn Coenen2016-08-121-13/+24
| * | Allow for ignore() to work with random UID tags.Martijn Coenen2016-08-111-31/+43
| |/
| * Add unregisterReceiver to fix a potential leakWei Wang2016-08-101-0/+9
| * Tron Metrics for Tag/P2P/HCE.Martijn Coenen2016-08-051-0/+29
| * Import translations. DO NOT MERGEBill Yi2016-07-204-7/+7
| * Merge "Fix HCE can't handle last empty I-block of a chain" into nyc-mr1-devMartijn Coenen2016-06-301-8/+8
| |\
| | * Fix HCE can't handle last empty I-block of a chainJizhou Liao2016-06-241-8/+8
| * | Fix Nfc beam status that is stuck in wrong stategeorge.kg_chang2016-06-271-1/+2
| * | Merge "nfc: Clock up temporarily when doing NFC payment transaction" into nyc...TreeHugger Robot2016-06-222-0/+13
| |\ \
| | * | nfc: Clock up temporarily when doing NFC payment transactionles_lee2016-06-202-0/+13
| | |/
| * | Allow system_server access to NFC reader mode API. am: 8561f64804 am: 6c6a969...Martijn Coenen2016-06-220-0/+0
| |\ \
| * \ \ Merge \"Allow system_server access to NFC reader mode API.\" into nyc-devMartijn Coenen2016-06-221-2/+3
| |\ \ \
| * \ \ \ Allow peripheral/WiFi handover in provision mode.Martijn Coenen2016-06-211-10/+10
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Import translations. DO NOT MERGE" into nyc-mr1-devBill Yi2016-06-0510-24/+24
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBill Yi2016-06-0310-24/+24
| * | | | | Import translations. DO NOT MERGEBill Yi2016-06-040-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-240-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Verify setForegroundDispatch caller is in foreground." into nyc-devMartijn Coenen2016-05-241-1/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Import translations. DO NOT MERGEBaligh Uddin2016-05-220-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Import translations. DO NOT MERGEBaligh Uddin2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Fix API review comments, add remove callback.Martijn Coenen2016-04-281-34/+81
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | NFC: Adding new vendor specific interface to NFC ServicePuneet Mishra2016-08-241-0/+10
* | | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | * | | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-230-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-050-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-280-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
| | | | | | * | | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-120-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | | | * | | | | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-050-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-310-0/+0
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-300-0/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-240-0/+0
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-080-0/+0
| | | | | | | | | | | | |\ \ \ \ \