summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainHEADmastermainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: Iaec96cd1e6134c2f87565e51e5505e7918427946 Change-Id: Ia733f449b890d199f5321e731c21cf5d6a7ead6e
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I005b8d16c5bab23f7e456ec71a2e062bfd5199c7 Change-Id: Iaec96cd1e6134c2f87565e51e5505e7918427946
2023-11-21Merge "Merge "Android.mk is going to be deprecated under device/google ↵Treehugger Robot
folder" into main am: 4a43047559 am: ce46a74797" into udc-qpr-dev-plus-aosp am: 400545daed Original change: https://android-review.googlesource.com/c/device/common/+/2836175 Change-Id: I5cd283e4c9d14e71a60197aa4ebbf084623baafc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21Merge "Merge "Android.mk is going to be deprecated under device/google ↵Treehugger Robot
folder" into main am: 4a43047559 am: ce46a74797" into udc-qpr-dev-plus-aosp
2023-11-21Merge "Android.mk is going to be deprecated under device/google folder" into ↵Treehugger Robot
main am: 4a43047559 am: 8502c68f2b am: de0d061137 Original change: https://android-review.googlesource.com/c/device/common/+/2836175 Change-Id: Id1787225ae7d38f99b8199a0af6f50ec07519085 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21Merge "Android.mk is going to be deprecated under device/google folder" into ↵Treehugger Robot
main am: 4a43047559 am: 8502c68f2b Original change: https://android-review.googlesource.com/c/device/common/+/2836175 Change-Id: I5e8343df3c0f972732cefa87e59de271459ecb36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Android.mk is going to be deprecated under device/google folder" into ↵Treehugger Robot
main am: 4a43047559 am: ce46a74797 Original change: https://android-review.googlesource.com/c/device/common/+/2836175 Change-Id: I4e9f25eda12cc36c806570cf444b8c5e1fb7b57a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Android.mk is going to be deprecated under device/google folder" into ↵Treehugger Robot
main am: 4a43047559 Original change: https://android-review.googlesource.com/c/device/common/+/2836175 Change-Id: Ib2a59b70c6acdc3067d807e4d2f10b5d791825b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Android.mk is going to be deprecated under device/google folder" into ↵Treehugger Robot
main am: 4a43047559 Original change: https://android-review.googlesource.com/c/device/common/+/2836175 Change-Id: I3f2a81155fe4753e0edec19bdc06754d2dc612f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Merge "Android.mk is going to be deprecated under device/google folder" into ↵Treehugger Robot
main
2023-11-17Android.mk is going to be deprecated under device/google folderHerbert Xue
The Android.mk will be renamed as Android.mk.template. Update the bash script with the new file name. Bug: 310087158 Test: NA Change-Id: I71d3139f4c659f73f6d028ff880218cd36734a64
2023-10-25Tweak lunch choice for git_mainGreg Kaiser
We add "trunk_staging-" in our COMMON_LUNCH_CHOICES so it will be a valid target in the way trunk stable lunch targets are parsed. Bug: 307738446 Test: None Change-Id: I005b8d16c5bab23f7e456ec71a2e062bfd5199c7
2022-12-12[automerger skipped] Merge changes from topic ↵android-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-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devAutomerger Merge Worker
"am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 9ea297d981 -s ours am: cb1f744e26 -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: Iade96e1cb1301697c2c781cf7b6edc43d56eb6dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s ours ↵Xin Li
am: 2bfcbfab0a -s ours am: 62f5f4ecb1 -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: If88ced3745c68e15f9b2b0b008f291393239b211 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s ours ↵Xin Li
am: 8cfb592530 -s ours am: b0da7ac627 -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: I30939a9cc7a796dd47b138ec2002bf6f23af1402 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 4d2f46f0a0 -s ours am: ↵Xin Li
b29bac41c7 -s ours am: 1f9c78ff56 -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: I4bd00e31a9a04cef4793076f6a4cb9b77ce85ab9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵android-u-beta-1-gplAutomerger Merge Worker
stage-aosp-master am: 9ea297d981 -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: Ia87e7b961c797b5f51c671da9a79e8e44dd1cf26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s ours ↵Xin Li
am: 2bfcbfab0a -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: Ifd4bedcc91ed67c6873c2752dd78cc7a4a4bb560 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s ours ↵Xin Li
am: 8cfb592530 -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: I7e85d3f898115fcef5e29c590b6b27f872a77806 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 4d2f46f0a0 -s ours am: ↵Xin Li
b29bac41c7 -s ours am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: I3ac43ff3bdd3baa9d78a897563c1dac8283be3c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵Automerger Merge Worker
stage-aosp-master * changes: [automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s ours [automerger skipped] Merge Android 13 QPR1 am: 4d2f46f0a0 -s ours
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s oursXin Li
am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: I275944fb14aff8e9490c8d8d6f673d1c5256b4dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 4d2f46f0a0 -s oursXin Li
am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: Ib68f6db9adad4217622dde98f2c50f6b4483b20b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s oursXin Li
am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: If7aac0c46c8da12aff6823ee6a077000fd9b9b36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 4d2f46f0a0 -s oursXin Li
am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history Original change: https://android-review.googlesource.com/c/device/common/+/2336993 Change-Id: I9c70c2f27ca3bfd5a881734058e12663669b58a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "Merge Android 13 QPR1"main-16k-with-phonesXin Li
2022-12-09Merge Android 13 QPR1Xin Li
Bug: 261731544 Merged-In: Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 Change-Id: I1e7b26d24cca468468945eb4818a6da3235ee2dc
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
4bed340f48 -s ours am: 6c390de4ca -s ours am skip reason: Merged-In I1a650df14a3fe49914025a02c70ee9728f32fb69 with SHA-1 2573c7ce0a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/20134697 Change-Id: I5dd13bac0f6e937b6be8dcc443295c7ccf894f9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
4bed340f48 -s ours am skip reason: Merged-In I1a650df14a3fe49914025a02c70ee9728f32fb69 with SHA-1 2573c7ce0a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/20134697 Change-Id: Ibc827c3fbe3cb0535e367a6f434a439050e2f79a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Merge tm-qpr-dev-plus-aosp-without-vendor@9129937Xin Li
Bug: 248070379 Merged-In: I1a650df14a3fe49914025a02c70ee9728f32fb69 Change-Id: I9af0fb4012f7f563b34441cef697b708374f080b
2022-04-01Update fastboot version checking to 3301 to support Pixel 7 am: fa6cbb870b ↵Bill Yi
am: a9757e7e42 Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/17533698 Change-Id: I5f1c59e2d7726c22804c52a20436978cae03f36b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Update fastboot version checking to 3301 to support Pixel 7 am: fa6cbb870bandroid-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_r56android-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_r32android13-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-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseBill Yi
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/17533698 Change-Id: If8f2d5145dd808d418964715f01bdb7885f33954 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Update fastboot version checking to 3301 to support Pixel 7Bill Yi
This script is only used for packaging factory images by the AOSP team. It does not affect build. TEST: flashed Pixel 7 BUG: 217478568 Change-Id: Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c0723d7fb4 -s ours ↵t_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_330444000aml_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_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_331131000main-16kandroid13-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-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-devaml_tz4_332714010Xin Li
am: 2d0a6ccd09 -s ours am: 8607521de4 -s ours am: a02f04d0c8 -s ours am skip reason: Merged-In I855f1f0b6bd10d54941d56889eb6b025ac11a693 with SHA-1 9fb33388af is already in history Original change: https://android-review.googlesource.com/c/device/common/+/1921920 Change-Id: I844e738a534d6120e9098821b13ed6a90f65d649
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c0723d7fb4 -s ours ↵Xin Li
am: 2d0a6ccd09 -s ours am: 8607521de4 -s ours am skip reason: Merged-In I855f1f0b6bd10d54941d56889eb6b025ac11a693 with SHA-1 9fb33388af is already in history Original change: https://android-review.googlesource.com/c/device/common/+/1921920 Change-Id: I5f9e512b1d538fdb7be1e5d1f8b4f97519bdd4f2
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c0723d7fb4 -s ours ↵Xin Li
am: 2d0a6ccd09 -s ours am skip reason: Merged-In I855f1f0b6bd10d54941d56889eb6b025ac11a693 with SHA-1 9fb33388af is already in history Original change: https://android-review.googlesource.com/c/device/common/+/1921920 Change-Id: I9f41fc9402d854b2881e880b51143c43aa40013d
2021-12-14[automerger skipped] Merge "Merge Android 12 QPR1" am: c0723d7fb4 -s oursXin Li
am skip reason: Merged-In I855f1f0b6bd10d54941d56889eb6b025ac11a693 with SHA-1 9fb33388af is already in history Original change: https://android-review.googlesource.com/c/device/common/+/1921920 Change-Id: I065a79594e1b814904d9ad70d81c51b4a28ce143
2021-12-14Merge "Merge Android 12 QPR1"android-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-1Xin Li
2021-12-14Merge Android 12 QPR1Xin Li
Bug: 210511427 Merged-In: I855f1f0b6bd10d54941d56889eb6b025ac11a693 Change-Id: I559ed2e77a5f4ec312500c5e19fec997726995e7
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
9fb33388af -s ours am: dc51f278a1 -s ours am: 99ec6d7c6b -s ours am skip reason: Merged-In I637b82fd2c57ac45b5c28b74941cf1c80235e844 with SHA-1 ba5e8ed70b is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/16274657 Change-Id: I4ca01ece7bc0bd476cacbb8eb4ac3f5607a1749f
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
9fb33388af -s ours am: dc51f278a1 -s ours am skip reason: Merged-In I637b82fd2c57ac45b5c28b74941cf1c80235e844 with SHA-1 ba5e8ed70b is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/16274657 Change-Id: I96f7ebc9e617887a12dae9584cf5e16fdb59c3d9
2021-11-18[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
9fb33388af -s ours am skip reason: Merged-In I637b82fd2c57ac45b5c28b74941cf1c80235e844 with SHA-1 ba5e8ed70b is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/16274657 Change-Id: I434ac153838bcc6839bedd93d97c12b8bf38e30e
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918temp_sam_210511427temp-sc-samXin Li
Bug: 205056467 Merged-In: I637b82fd2c57ac45b5c28b74941cf1c80235e844 Change-Id: I855f1f0b6bd10d54941d56889eb6b025ac11a693
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 56d83740c9 am: 863f4b33ac am: 1206dffd84 Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: Ib89a42ed8216f9e02ac96bb5971fb41e8aafe6b5
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 56d83740c9 am: ba5e8ed70b am: 0956136ed8 Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: I5ddf6bf82a487b8e8f4155cefe67082126772693
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 15f0db8ce8 am: 8ea1d48f9e am: f8766d1fe7 Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: I529607e9543e9575be2253bce1d67ac373154c56
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 56d83740c9 am: 863f4b33ac Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: Ia0ce9ae1ce999616c55ccf564ce3d7155fbf26fa
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 56d83740c9 am: ba5e8ed70b Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: Ic30ee70da6c33f26fab1c713fe1ecdb58bfbfe47
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 15f0db8ce8 am: 8ea1d48f9e Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: Ie3fb4ec1bc9a5364e0623b10d0eb8292ba6d1d37
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 17:41:52 +0000