summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1nougat-releasenougat-cts-releaseThe 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...nougat-devMartijn 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
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-241-1/+8
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | |