summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
|\ \
| * \ Allow system_server access to NFC reader mode API. am: 8561f64804 am: 6c6a969...Martijn Coenen2016-06-210-0/+0
| |\ \
| | * \ Allow system_server access to NFC reader mode API. am: 8561f64804 am: 6c6a969835Martijn Coenen2016-06-211-2/+3
| | |\ \
| | | * \ Allow system_server access to NFC reader mode API. am: 8561f64804Martijn Coenen2016-06-211-2/+3
| | | |\ \
| | | | * \ Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
| | | | |\ \
| | | | | * | Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
* | | | | | | Merge \"Allow system_server access to NFC reader mode API.\" into nyc-devMartijn Coenen2016-06-221-2/+3
|\| | | | | |
| * | | | | | Merge "Allow system_server access to NFC reader mode API." into nyc-devMartijn Coenen2016-06-211-2/+3
| |\ \ \ \ \ \
| | * | | | | | Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-211-2/+3
* | | | | | | | Allow peripheral/WiFi handover in provision mode.Martijn Coenen2016-06-211-10/+10
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Import translations. DO NOT MERGEBill Yi2016-06-033-5/+5
* | | | | | Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-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. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-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. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-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. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-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. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-240-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. (DO NOT MERGE) am: c48b...Martijn Coenen2016-05-243-0/+203
| | | | | | | | | | |\
| | | | | | | | | | | * Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE)Martijn Coenen2016-05-243-0/+203
| | | | | | | | | | | |\
| | | | | | | | | | | | * Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE)Martijn Coenen2016-05-233-0/+203
* | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-240-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-240-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | | |\| | | | | | | | |
| | | | * | | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | | | |\| | | | | | | |
| | | | | * | | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | | | | |\| | | | | | |
| | | | | | * | | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bd am: 0ce4...Martijn Coenen2016-05-241-1/+8
| | | | | | |\| | | | | |
| | | | | | | * | | | | | Verify setForegroundDispatch caller is in foreground. am: 0889ac84bdMartijn Coenen2016-05-241-1/+8
| | | | | | | |\| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 18:03:25 +0000