summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 45a706e4feHEADandroid-s-beta-4android-s-beta-3masterandroid-s-beta-4Roman Kiryanov2021-03-151-1/+1
|\
| * Merge "Use `ro.boot.qemu` to check if the device is an emulator"android-s-beta-2android-s-beta-1Roman Kiryanov2021-03-151-1/+1
|/|
| * Use `ro.boot.qemu` to check if the device is an emulatorRoman Kiryanov2021-03-101-1/+1
|/
* Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
|\
| * Mark ab/6881855 as merged am: a9c06ce907Xin Li2020-11-250-0/+0
| |\
| * \ [automerger skipped] Skip ab/6749736 in stage. am: 0e8d45a813 -s ours am: f9d...Xin Li2020-10-090-0/+0
| |\ \
| | * \ [automerger skipped] Skip ab/6749736 in stage. am: 0e8d45a813 -s oursXin Li2020-10-090-0/+0
| | |\ \
* | | \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbt" am: a24d874b17Bob Badour2021-02-191-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbt"Bob Badour2021-02-181-0/+2
|/| | | |
| * | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/libbtBob Badour2021-02-121-0/+2
|/ / / /
* | | / Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\| | | | |_|/ |/| |
| * | [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| |\|
| | * [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | |\
| | | * [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | | |\
| * | | | Merge "LMP idle timeout update" am: 588bb9ac1d am: 2857fe6ed7 am: 98990d7f90 ...Treehugger Robot2020-07-281-0/+2
| |\| | |
| * | | | Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7b am: 33ab16ebcd a...Treehugger Robot2020-05-041-0/+3
| |\ \ \ \
* | \ \ \ \ Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Merge "LMP idle timeout update" am: 588bb9ac1d am: 2857fe6ed7 am: 98990d7f90Treehugger Robot2020-07-281-0/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge "LMP idle timeout update" am: 588bb9ac1d am: 2857fe6ed7Treehugger Robot2020-07-281-0/+2
| | |\ \
| * | | | Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7b am: 33ab16ebcd a...Treehugger Robot2020-05-041-0/+3
| |\| | | | | |_|/ | |/| |
* | | | Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li2020-08-270-0/+0
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7b am: 33ab16ebcdTreehugger Robot2020-05-041-0/+3
| |\ \ | | |/ | |/|
| * | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li2019-10-300-0/+0
| |\ \
| * \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\ \ \
| * \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| |\ \ \ \
| * \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge "LMP idle timeout update" am: 588bb9ac1dTreehugger Robot2020-07-281-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge "LMP idle timeout update"Treehugger Robot2020-07-281-0/+2
|/| | | | | |
| * | | | | | LMP idle timeout updatemullerf2020-07-271-0/+2
|/ / / / / /
* | | | | | Merge "Add METADATA to libbt: Apache2=NOTICE" am: c738922a7bandroid-r-beta-3android-r-beta-2Treehugger Robot2020-05-041-0/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge "Add METADATA to libbt: Apache2=NOTICE"Treehugger Robot2020-05-041-0/+3
|/| | | | |
| * | | | | Add METADATA to libbt: Apache2=NOTICEBob Badour2020-05-011-0/+3
|/ / / / /
* | | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\| | |
| | * | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | |\ \ \ | | | | |/ | | | |/|
* | | / | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
|\| | | | | |_|/ / |/| | |
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
|/| | |
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| |\| |
| | * | Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li2019-09-053-17/+57
| | |\ \
| | | * | DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-043-17/+57
| | |/| | | | |/ / | |/| |
* | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-020-0/+0
|\| | | | |_|/ |/| |
| * | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-013-17/+57
| |\ \ | |/ / |/| / | |/
* | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-240-0/+0
|\|
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\
* | \ [automerger skipped] Merge "DO NOT MERGE" am: 566c7ceefa -s ours am: 3991279...Xin Li2018-12-100-0/+0
|\ \ \ | | |/ | |/|
| * | [automerger skipped] Merge "DO NOT MERGE" am: 566c7ceefa -s oursXin Li2018-12-100-0/+0
| |\|
| | * [automerger skipped] Merge "DO NOT MERGE"Xin Li2018-12-100-0/+0
| | |\
| | | * Merge "DO NOT MERGE"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot2018-12-100-0/+0
| | | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 18:58:25 +0000