summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Nfc: read extra properties of Mifare Classiccm-14.0Hamster Tian2016-10-091-0/+11
* Revert "Stop building NXP stack."staging/cm-14.0-cafBruno Martins2016-08-313-6/+25
* 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
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-060-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-020-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-010-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-190-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-040-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-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-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
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | / / / / / / / / / / / / / / / / / / / 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-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-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
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | |