aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-18Merge "Enable windows target" into mainHEADmastermainTreehugger Robot
2024-03-18Enable windows targetMatt Gilbride
`//tools/apksig` build targets will soon depend on this, and windows must be enabled (transitively) on all dependencies. Bug: 319296492 Test: TH Change-Id: I11d5acaecb20d7de4797ddc418fb4714b18057c3
2022-09-02Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: ↵android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devCole Faust
3e21821be8 am: 5e78e9e93a am: c2aaa90b6e Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971 Change-Id: I566141c764e9c1edb9d0f99cc79af7b0b1e3aa24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: ↵android-u-beta-1-gplmain-16k-with-phonesCole Faust
3e21821be8 am: 5e78e9e93a Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971 Change-Id: I994c3daf46ddb4e57fb448ba86e910711f1f01cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: ↵Cole Faust
3e21821be8 Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971 Change-Id: I8b6ff6c2e9cbc7d30f55ee6e6f24c854736b72c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02Merge "Fix module-file name collisions" am: e4793273da am: 713073831fCole Faust
Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971 Change-Id: I53e789ec7ed81aef9485c9b730290af45ecdefd7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02Merge "Fix module-file name collisions" am: e4793273daCole Faust
Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971 Change-Id: I76942bfe7b0fc4a7170358c3f9954d33d10ca31a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02Merge "Fix module-file name collisions"main-16kCole Faust
2022-09-01Fix module-file name collisionsCole Faust
Bazel doesn't allow a module and file with the same name. Bug: 198619163 Test: Presubmits Change-Id: Iefdf0ddbaab2336fd4d9c5d2081e7e6c13464e6d
2021-10-16Merge "Remove obsolete product_sdk.mk" am: ce1e3e3170 am: d1ecad2da3 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Treehugger Robot
9c01d1a015 am: cfdf6d7663 am: b60f3f8212 Original change: https://android-review.googlesource.com/c/platform/sdk/+/1859826 Change-Id: I0ad0e75d3efa2aba26e57a8a7adbd8a64480a0f7
2021-10-16Merge "Remove obsolete product_sdk.mk" am: ce1e3e3170 am: d1ecad2da3 am: ↵Treehugger Robot
9c01d1a015 am: cfdf6d7663 Original change: https://android-review.googlesource.com/c/platform/sdk/+/1859826 Change-Id: Iba397cf81e3e40d09cc722811b01da639acb445c
2021-10-16Merge "Remove obsolete product_sdk.mk" am: ce1e3e3170 am: d1ecad2da3 am: ↵Treehugger Robot
9c01d1a015 Original change: https://android-review.googlesource.com/c/platform/sdk/+/1859826 Change-Id: I2d62a3b330a0a77fc0125c6aed9fc1531ec28b3f
2021-10-16Merge "Remove obsolete product_sdk.mk" am: ce1e3e3170 am: d1ecad2da3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1859826 Change-Id: Icff033b0d13933d1f125f3289f36ad46ffc69834
2021-10-16Merge "Remove obsolete product_sdk.mk" am: ce1e3e3170android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1859826 Change-Id: I033e1191d2b1ef06a95b3282390b04f72c2975f5
2021-10-16Merge "Remove obsolete product_sdk.mk"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-15Remove obsolete product_sdk.mkDan Willemsen
The build rules in development/build/Android.bp have explicit dependencies now, they don't need to be repeated here. Bug: 187222815 Change-Id: I779c09d4701c364684ab91215cf05f41d75da372
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I31a1a72bcad771bfd468749a2962c47b01014992
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42 ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
am: fc7153a807 am: b3f92fe65c Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ida16e838b562970d98037034e59302b36122ecd8
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42 ↵Treehugger Robot
am: fc7153a807 am: b3f92fe65c Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib43f7c8c814003729e56d33ce2fe54fbb047f59f
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42 ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseTreehugger Robot
am: fc7153a807 Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2b801c6244b415a543b09d4c2c021637cfe04391
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64 am: 34fe745f42Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib240d48daf3bf658339841c6d8a71b749da4d14b
2021-02-15Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk" am: 6e37a45f64android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/sdk/+/1589083 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7513c7aa6f0f806ec744c2ecdb65f2318f743679
2021-02-15Merge "[LSC] Add LOCAL_LICENSE_KINDS to sdk"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to sdkBob Badour
Added SPDX-license-identifier-Apache-2.0 to: annotations/Android.bp dumpeventlog/Android.bp eventanalyzer/Android.bp hierarchyviewer/Android.bp hierarchyviewer/etc/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If52b586f5ea93255c9e70d3b70d10a8796ac11c2
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a am: ccad5384d7 am: 18c1c14ad4 am: 46a5c62c67 Change-Id: Ib5a1e041abdbd5696d1b4467fa1581ae5d9c344c
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a am: ccad5384d7 am: 18c1c14ad4 Change-Id: I083d95ce5c952b8709b14d03279ed03913cb488f
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a am: ccad5384d7 Change-Id: Iaaff1e1152ae574f85e78797ecb849e29c805ef8
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: ↵Treehugger Robot
7cb6fc634a Change-Id: I0fc20e72e7edfc5daf2068bf0aa6ea25ddb4a1c9
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I89177e37d0cc6ce6598248d84ef22030338ddb0c
2020-05-08Merge "Remove all non-Apache2 licensed files from sdk"Treehugger Robot
2020-05-06Remove all non-Apache2 licensed files from sdkBob Badour
Remove MODULE_LICENSE_APACHE2 Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Remove EPL-licensed eclipse plugin and attribute_stats. Remove CC-BY-SA licensed typos files. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: treehugger Test: https://android-build.googleplex.com/builds/forrest/run/L63500000550775268 Exempt-From-Owner-Approval: janitorial work Change-Id: I5fafa76de21fb0b46c82a2c07ac048afbee3df25
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: ↵Bob Badour
d58f8ba3b1 am: f1a59c9833 am: 9d23b89ef1 Change-Id: I463b8ee72ee68d390c4398e5287b6d1003197939
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: ↵Bob Badour
d58f8ba3b1 am: f1a59c9833 Change-Id: I0d3fb69b92ad417802dd038bdf989a6b84cfc210
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: ↵Bob Badour
d58f8ba3b1 Change-Id: I297730ce4f9da2bf30dde696439ab825cd642b00
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48eBob Badour
Change-Id: I2920d1fca1593e86805ec8a728121cf2513e2bc5
2020-05-06Merge "Revert "Remove unused project."" am: fc7cda06f5Bob Badour
Change-Id: I1dbd864aa8ee9e2a44b6acc173c12740abf9447f
2020-05-06Merge "Revert "Remove unused project.""Bob Badour
2020-05-06Revert "Remove unused project."Paul Duffin
This reverts commit eaada771a6e62ca494a625ce1b060f1a94fa9877. Reason for revert: Breaks build_test and other builds Bug: 155862492 Change-Id: I1a14b84d54b05596ec250b31ae56e437cf49fd81
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44e am: e36f051d41 ↵Treehugger Robot
am: 14a008655d am: a4cd7aaab7 Change-Id: Ib3ba18b7f4f2cffa0ca2f17eaae1801ee3cca906
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44e am: e36f051d41 ↵Treehugger Robot
am: 14a008655d Change-Id: I03a76901da83c5a21edaa5a00cf5c31a677d9b5f
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44e am: e36f051d41Treehugger Robot
Change-Id: I530ec2fa2142d451518127ddc00536024d871eed
2020-05-06Merge "Remove unused project." am: 1aa104fb55 am: 0300bcd44eTreehugger Robot
Change-Id: I3d51b5c9a138057e41e8d90574fc2afb37d98390
2020-05-06Merge "Remove unused project." am: 1aa104fb55Treehugger Robot
Change-Id: I8c8344b89598c084293a180a4638817a3a7474f3
2020-05-06Merge "Remove unused project."Treehugger Robot
2020-05-05Remove unused project.Bob Badour
Remove the source and switch the OWNERS to the janitors to prevent necromancy. Test: treehugger Change-Id: I85d58aafad17c65d7d2963c99409dddf8888fb16
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-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_r45android-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_r48android-11.0.0_r47android-11.0.0_r46android-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 Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3bbeaa3d26 am: b0dcd4a2c7 -s ours am skip reason: subject contains skip directive Change-Id: I8d76a8e22b1035c8dbac6eef7d4d9935b909c796
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 3bbeaa3d26 Change-Id: Id2594c8f41a6fc0d75b290e83c6e9b23d9b4a43f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I190b6dcea3636b7e3150597b51dfc6fb7d6400ad
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am: 3ec3e42074 -s ours am: e2c68225d7 -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I066134470e8f5a81206ee7dda9849b68f5884810
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am: 3ec3e42074 -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I1d28b9a7ed52a28309afa14dc5be11dfbca63b55
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 14:31:48 +0000