summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 7502275 from 316b2ef507d0b4568109054280135fdc94d81fb3 to simp...simpleperf-releaseAndroid Build Coastguard Worker2021-06-280-0/+0
|\
| * Snap for 7502275 from 316b2ef507d0b4568109054280135fdc94d81fb3 to simpleperf-...Android Build Coastguard Worker2021-06-280-0/+0
|/|
| * 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 "Snap for 7213714 from 45a706e4fe96097a8367b9beb6016cb579a3281a to simp...android-build-prod (mdb)2021-03-171-1/+1
|\ \ \
| * | | Snap for 7213714 from 45a706e4fe96097a8367b9beb6016cb579a3281a to simpleperf-...android-build-prod (mdb)2021-03-171-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
| |/
* | Merge "Snap for 7209783 from f5d505f0e2f56d26d5686c529e6156fe51c57b61 to simp...android-build-prod (mdb)2021-03-150-0/+0
|\ \
| * | Snap for 7209783 from f5d505f0e2f56d26d5686c529e6156fe51c57b61 to simpleperf-...android-build-prod (mdb)2021-03-150-0/+0
|/| | | |/
| * 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 "Snap for 7168215 from a24d874b172f7e463f26c013cc852fdf0dec65c7 to simp...android-build-prod (mdb)2021-02-241-0/+2
|\ \ \ \ \ \
| * | | | | | Snap for 7168215 from a24d874b172f7e463f26c013cc852fdf0dec65c7 to simpleperf-...android-build-prod (mdb)2021-02-241-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
| |/ / / /
* | | | | Merge "Snap for 7116807 from a9c06ce907db2d1154b8a450ea36b147730c5c6c to simp...android-build-prod (mdb)2021-02-010-0/+0
|\ \ \ \ \
| * | | | | Snap for 7116807 from a9c06ce907db2d1154b8a450ea36b147730c5c6c to simpleperf-...android-build-prod (mdb)2021-02-010-0/+0
|/| | | | | | |/ / / /
| * | | / 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
| | |\ \ \ \
* | | \ \ \ \ Merge "Snap for 7002008 from 0e8d45a8134cec0c44ada4bab21d920bb692bb66 to simp...android-build-prod (mdb)2020-11-300-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Snap for 7002008 from 0e8d45a8134cec0c44ada4bab21d920bb692bb66 to simpleperf-...android-build-prod (mdb)2020-11-300-0/+0
|/| | | | | | | | |/ / / / / /
| * | | | | | 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
| | |\| | | | | | |_|/ | | |/| |
* | | | | Merge "Snap for 6844436 from 5bd0610be9161e9cef27c6d13b562efcb0fd61d3 to simp...android-build-prod (mdb)2020-09-170-0/+0
|\ \ \ \ \
| * | | | | Snap for 6844436 from 5bd0610be9161e9cef27c6d13b562efcb0fd61d3 to simpleperf-...android-build-prod (mdb)2020-09-170-0/+0
|/| | | | | | |/ / / /
| * | | | 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 "Snap for 6792789 from 2857fe6ed79041c3cd4be03264b759adcef94f79 to simp...android-build-prod (mdb)2020-08-261-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Snap for 6792789 from 2857fe6ed79041c3cd4be03264b759adcef94f79 to simpleperf-...android-build-prod (mdb)2020-08-261-0/+2
|/| | | | | | | | | |/ / / / / / /
| * | | | | | | 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 "Snap for 6577974 from 33ab16ebcd5f6e434ff0f5479367ef76db3bac1e to simp...android-build-prod (mdb)2020-06-101-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Snap for 6577974 from 33ab16ebcd5f6e434ff0f5479367ef76db3bac1e to simpleperf-...android-build-prod (mdb)2020-06-101-0/+3
|/| | | | | | | | |/ / / / / /
| * | | | | | 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
| |/ / / / /