aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-29Add METADATA to system_api: BSD=NOTICE am: 6f8051d341 am: 1f322ad4c1 am: ↵HEADt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-t-preview-2android-t-preview-1android-t-beta-3android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-platform-14.0.0_r3android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-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_r4android-mainline-12.0.0_r39android-mainline-12.0.0_r36android-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_r100android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-13.0.0_r9android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r8android-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_r7android-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_r6android-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_r5android-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_r4android-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_r31android-13.0.0_r30android-13.0.0_r3android-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_r2android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r12android-13.0.0_r11android-13.0.0_r10android-13.0.0_r1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-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_r2android-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.1.0_r1android-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_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010aml_tz3_311312010aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_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_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmaingki13-boot-releaseandroid13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-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-platform-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-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-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-gsiandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-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-releaseandroid13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-releaseandroid12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsiandroid12L-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-mainline-tzdata3-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-art-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1aml_tz4_332714010aml_tz3_314012010Bob Badour
a1ded2684a am: f8d46ecb0e am: b4a03abdd9 Change-Id: Idb62673139a8084dfd6d0b8e7973fed31f804cee
2020-04-29Add METADATA to system_api: BSD=NOTICE am: 6f8051d341 am: 1f322ad4c1 am: ↵android-s-preview-1android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
a1ded2684a am: f8d46ecb0e Change-Id: I4a7079cfecedaf5ac81f5166b9972360f0e6a7af
2020-04-29Add METADATA to system_api: BSD=NOTICE am: 6f8051d341 am: 1f322ad4c1 am: ↵Bob Badour
a1ded2684a Change-Id: I56329e2267ffb4988ca6259758bef370509cf9f6
2020-04-29Add METADATA to system_api: BSD=NOTICE am: 6f8051d341 am: 1f322ad4c1Bob Badour
Change-Id: I903a24cb2a019ea93d0cc43dafce1abc78e1a75b
2020-04-29Add METADATA to system_api: BSD=NOTICE am: 6f8051d341android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ife8cc820ee2f6cc6a5010a2d14d47358d348ca24
2020-04-28Add METADATA to system_api: BSD=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I5f9876d6dd6a9c08d3361d6ab753f92be39adee2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 02d6e74ded -s ours am: 49b6696606 am: 7b2e67bca8 am: e35c3d3015 -s ours am skip reason: subject contains skip directive Change-Id: If14b4d653142e2d2088253e68763b2043aa86d0f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 02d6e74ded -s ours am: 49b6696606 am: 7b2e67bca8 Change-Id: I7b8089bf530f916143a61e0fbf751ce13fb25223
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 02d6e74ded -s ours am: 49b6696606 Change-Id: I09021795fd371f74736baf51db0aac7c390083e8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 02d6e74ded -s ours am skip reason: subject contains skip directive Change-Id: I056cbadbf703438c1468ecd947995aebdebf1d21
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1a9df8851be2d6efc360266b6599f3bd671d026b
2020-03-30Remove redundant NOTICE copied from LICENSE. am: d827f1513b am: 8e2fa477b2 ↵Bob Badour
am: 7d3eaaf5c9 am: 356d3a8c0f am: be310c3d68 Change-Id: If597a5c7f03e9108e9def4045d9b6d508fd6e8ee
2020-03-30Remove redundant NOTICE copied from LICENSE. am: d827f1513b am: 8e2fa477b2 ↵Bob Badour
am: 7d3eaaf5c9 am: 356d3a8c0f Change-Id: I943321be8e9d1b5edf873ac420e6997944d8e458
2020-03-30Remove redundant NOTICE copied from LICENSE. am: d827f1513b am: 8e2fa477b2 ↵Bob Badour
am: 7d3eaaf5c9 Change-Id: I0871e40e8401e020d79f97977efdf18670896e79
2020-03-30Remove redundant NOTICE copied from LICENSE. am: d827f1513b am: 8e2fa477b2Bob Badour
Change-Id: Id1d913e1a7979ca9278e74c1e542b3246a34d35f
2020-03-30Remove redundant NOTICE copied from LICENSE. am: d827f1513b am: 8e2fa477b2Bob Badour
Change-Id: I3346513f9e979dca18a8c73ea90cfbf5a57153a6
2020-03-30Remove redundant NOTICE copied from LICENSE. am: d827f1513bBob Badour
Change-Id: If0e4bb35f9d0fe8f0f982f5793c83517e7dae951
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ic85f87c7bf3aa29d38d56ac600bb70d8dc4a8e48
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am: 62be9affe5 am: ec12a00117 am: fd82db7735 -s ours am skip reason: subject contains skip directive Change-Id: I889ea3b499e940140cb5a6e0f11f984688030fd1
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am: 62be9affe5 am: ec12a00117 Change-Id: I49200c8ca2c8c0b176eb25d6484566ad990d15e1
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am: 62be9affe5 Change-Id: I5b2e33ca2e3b7f9edf2d1e118adadd632cfeddbd
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 5f25b45491 Change-Id: I93d726649cfcfe44ce0a0266ba9c0ce59c3b5716
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am skip reason: subject contains skip directive Change-Id: I97af6d2a46f1dd2d2c5b01a1c6916636a996dbbf
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1e79ed691a36790ffe44081e082552e28599940b
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
-s ours am: d345b53f1f -s ours am: c5ab9e3129 -s ours am: 475ddf39d5 -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history Change-Id: Iac3aac3216b0b5d056f0522b9630dcb02a4c3e3e
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
-s ours am: d345b53f1f -s ours am: c5ab9e3129 -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history Change-Id: Iee3ef0a44a1a105a52c5c34bfe5e1f1eb1ab2dd4
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
-s ours am: d345b53f1f -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history Change-Id: I0c1f3147182792c89e4e5a600eaf1852bc728c39
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
-s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history Change-Id: Ic843966341d0167591455ad01549cbda9abbef65
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
am: 5a59b94d97 -s ours am: e8b7a8b110 -s ours am: 8fbc662a9c -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history Change-Id: Icac3ff28183b0f5dd37fdff3795dee12d2842ed7
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
am: 5a59b94d97 -s ours am: e8b7a8b110 -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 4b3c76a71e is in history Change-Id: I8c233fffd6ecc65aa10bcc96ef2adfb420ea6ac7
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
am: 5a59b94d97 am: 62a171fbb7 am: 5bc6891da7 -s ours am: 3effc4e58a -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history Change-Id: I288e1e99038d2f5fb7a2fe4a167fac772ac1f801
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
am: 5a59b94d97 am: 62a171fbb7 am: 5bc6891da7 -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history Change-Id: Ie9300f3ee2d7a5c95183171c0edc9b504d36af74
2020-03-06Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e am: 5a59b94d97 am: ↵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_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseAutomerger Merge Worker
62a171fbb7 Change-Id: I993a8954c23642cc06dfed7bf4c8d3e82e07fe2c
2020-03-06Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e am: 5a59b94d97android-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_r18android11-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-d2-releaseAutomerger Merge Worker
Change-Id: Ib0e7fc2162c451af1532c59dd9e9257c12e9645c
2020-03-06[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker
am: 5a59b94d97 -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history Change-Id: Ibc23b1a2de35c5c04d7ac82128b64cb0ee543247
2020-03-06Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71eandroid-11.0.0_r16android11-d1-b-releaseAutomerger Merge Worker
Change-Id: I1f4a09497944bcf9253427c24dcb8f0053a0a956
2020-03-05Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bc am: 8e3c34ad9c am: ↵Automerger Merge Worker
1133176ae1 am: 80e484863c am: 3d5f1ff4d5 Change-Id: Ieb4dfd69bb3bba198b22d934312de1c7aa85b5f0
2020-03-05Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bc am: 8e3c34ad9c am: ↵Automerger Merge Worker
1133176ae1 am: 80e484863c Change-Id: Ia6558260c229760258469e76242a99633824a486
2020-03-05Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bc am: 8e3c34ad9c am: ↵Automerger Merge Worker
1133176ae1 Change-Id: Ifd216d36f11c40ab8b9f66dbe35579710ce12f1c
2020-03-05Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bc am: 8e3c34ad9cAutomerger Merge Worker
Change-Id: Idd284bc9c7fed822bc4f96cf42e22242a5dd532a
2020-03-05Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bc am: 8e3c34ad9cAutomerger Merge Worker
Change-Id: I32dc10aadf92f3061860b718f9afb63cfe9f0dc4
2020-03-05Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bcAutomerger Merge Worker
Change-Id: Iba6d1adaa9c1a182ecddac823bec14f32b2c8c11
2020-03-05Add kUpdateStatusCleanupPreviousUpdate.android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-devYifan Hong
Test: pass Bug: 147696014 Change-Id: I63160745c5904597d4faf573a556ada753674b9f Merged-In: I63160745c5904597d4faf573a556ada753674b9f
2020-02-26Add kUpdateStatusCleanupPreviousUpdate.android-r-preview-4android-r-preview-3android-r-preview-2Yifan Hong
Test: pass Bug: 147696014 Change-Id: I63160745c5904597d4faf573a556ada753674b9f
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-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_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 652ca8938a -s ours am skip reason: subject contains skip directive Change-Id: I14d01d3ce51da142180a96718af07ad870037d06
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ie360a56b58e71335ef1acc28af11f7fae081e7a7
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9eaf8f485b -s ours am: 59d8301e4d -s ours am: 70392a8547 -s ours Change-Id: I687d8f26a39961de73400089140aaa9a2acdfdd8
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9eaf8f485b -s ours am: 59d8301e4d -s ours Change-Id: I8bd0ea3bbd06359438e64e89ffcbc0615032d962
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 9eaf8f485b -s ours Change-Id: I4e39afb1df962b680893fee8b1d47fc0fe3ef588
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-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.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-releaseBill Yi
Change-Id: Ibb6a0c3e4b887ebce0f6bbfea956fa63f23fc2b1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 07:02:38 +0000