summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in oc-release history after reset to oc-devandroid-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-releasegitbuildkicker2017-04-180-0/+0
|\
| * merge in oc-release history after reset to oc-devgitbuildkicker2017-04-130-0/+0
| |\
| | * merge in oc-release history after reset to oc-devgitbuildkicker2017-04-060-0/+0
| | |\
| | | * merge in oc-release history after reset to mastergitbuildkicker2017-03-230-0/+0
| | | |\
| | | | * merge in oc-release history after reset to mastergitbuildkicker2017-03-220-0/+0
| | | | |\
| | | | | * merge in oc-release history after reset to 568e414ac5a62911664ae7498ebcc07204...gitbuildkicker2017-03-220-0/+0
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | merge in oc-release history after reset to mastergitbuildkicker2017-03-220-0/+0
| | | | |\|
| | | | | * merge in oc-release history after reset to mastergitbuildkicker2017-03-130-0/+0
| | | | | |\
| | | | | | * merge in oc-release history after reset to b1ac19f3800c8edb91ab2d46ee189799fd...gitbuildkicker2017-03-130-0/+0
| | | | | | |\ | | | | | | |/ | | | | | |/|
* | | | | | | libhardware_legacy: vendor_availableandroid-vts-8.0_r2android-vts-8.0_r1oreo-devSteven Moreland2017-04-171-0/+2
* | | | | | | Merge "Mark as vendor_available" into oc-devTreeHugger Robot2017-04-171-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Mark as vendor_availableDan Willemsen2017-04-141-0/+1
| |/ / / / / /
* / / / / / / libhardware_legacy: Android.mk -> Android.bpSteven Moreland2017-04-148-70/+67
|/ / / / / /
* / / / / / Include what you useDan Willemsen2017-04-112-2/+2
|/ / / / /
* / / / / Exporting headers as libhardware_legacy_headersVijay Venkatraman2017-04-051-0/+5
|/ / / /
* | | | Merge "[AWARE]: Add support to accept either passphrase or pmk" am: ad6f1d551...Etan Cohen2017-03-231-19/+74
|\ \ \ \ | |/ / / |/| | |
| * | | Merge "[AWARE]: Add support to accept either passphrase or pmk" am: ad6f1d5512Etan Cohen2017-03-231-19/+74
| |\ \ \
| | * \ \ Merge "[AWARE]: Add support to accept either passphrase or pmk"Etan Cohen2017-03-231-19/+74
| | |\ \ \
| | | * \ \ Merge "[AWARE]: Add support to accept either passphrase or pmk"Etan Cohen2017-03-231-19/+74
| | | |\ \ \
| | | | * | | [AWARE]: Add support to accept either passphrase or pmkSubhani Shaik2017-03-141-19/+74
* | | | | | | Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7 am: 41fc794effEtan Cohen2017-03-211-1/+4
|\| | | | | | | |_|_|_|/ / |/| | | | |
| * | | | | Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7Etan Cohen2017-03-211-1/+4
| |\| | | |
| | * | | | Merge "[AWARE]: Fix Nan capabilities mismatch"Etan Cohen2017-03-211-1/+4
| | |\| | |
| | | * | | Merge "[AWARE]: Fix Nan capabilities mismatch"Etan Cohen2017-03-211-1/+4
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | [AWARE]: Fix Nan capabilities mismatchSubhani Shaik2017-03-161-1/+4
| | | |/ /
* | | | / Merge "[AWARE]: Add range report in SDEA params" am: 1da29541bc am: eaed213c02Etan Cohen2017-03-091-6/+5
|\| | | | | |_|_|/ |/| | |
| * | | Merge "[AWARE]: Add range report in SDEA params" am: 1da29541bcEtan Cohen2017-03-091-6/+5
| |\| |
| | * | Merge "[AWARE]: Add range report in SDEA params"Etan Cohen2017-03-091-6/+5
| | |\|
| | | * Merge "[AWARE]: Add range report in SDEA params"android-n-mr2-preview-2Etan Cohen2017-03-091-6/+5
| | | |\
| | | | * [AWARE]: Add range report in SDEA paramsSubhani Shaik2017-03-081-6/+5
| | | |/
* | | | Merge "Include get_iface_handle in header file" am: ea2adcc23a am: 9aaa236e05Etan Cohen2017-03-081-0/+1
|\| | |
| * | | Merge "Include get_iface_handle in header file" am: ea2adcc23aEtan Cohen2017-03-081-0/+1
| |\| |
| | * | Merge "Include get_iface_handle in header file"Etan Cohen2017-03-081-0/+1
| | |\|
| | | * Merge "Include get_iface_handle in header file"Etan Cohen2017-03-081-0/+1
| | | |\
| | | | * Include get_iface_handle in header fileSubhani Shaik2017-03-011-0/+1
* | | | | Merge "[AWARE]: Fix documentation for Service responder policy" am: b82ef271a...Etan Cohen2017-02-241-1/+1
|\| | | |
| * | | | Merge "[AWARE]: Fix documentation for Service responder policy" am: b82ef271aaEtan Cohen2017-02-241-1/+1
| |\| | |
| | * | | Merge "[AWARE]: Fix documentation for Service responder policy"Etan Cohen2017-02-241-1/+1
| | |\| |
| | | * | Merge "[AWARE]: Fix documentation for Service responder policy"android-o-preview-1o-previewEtan Cohen2017-02-241-1/+1
| | | |\|
| | | | * [AWARE]: Fix documentation for Service responder policySubhani Shaik2017-02-231-1/+1
* | | | | Merge "[AWARE]: Enable SDEA based SSI" am: 83b034ea0f am: f9758f839eEtan Cohen2017-02-211-0/+32
|\| | | |
| * | | | Merge "[AWARE]: Enable SDEA based SSI" am: 83b034ea0fEtan Cohen2017-02-211-0/+32
| |\| | |
| | * | | Merge "[AWARE]: Enable SDEA based SSI"Etan Cohen2017-02-211-0/+32
| | |\| |
| | | * | Merge "[AWARE]: Enable SDEA based SSI"Etan Cohen2017-02-211-0/+32
| | | |\ \ | | | | |/ | | | |/|
| | | | * [AWARE]: Enable SDEA based SSISubhani Shaik2017-02-211-0/+32
| | | |/
* | | | Merge "[AWARE]: Configure ranging on discovery sessions" am: 427212dafe am: d...Etan Cohen2017-02-211-14/+88
|\| | |
| * | | Merge "[AWARE]: Configure ranging on discovery sessions" am: 427212dafeEtan Cohen2017-02-211-14/+88
| |\| |
| | * | Merge "[AWARE]: Configure ranging on discovery sessions"Etan Cohen2017-02-211-14/+88
| | |\|
| | | * Merge "[AWARE]: Configure ranging on discovery sessions"Etan Cohen2017-02-211-14/+88
| | | |\
| | | | * [AWARE]: Configure ranging on discovery sessionsSubhani Shaik2017-02-171-14/+88