summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseBill Yi
2573c7ce0a am: 56d83740c9 Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: I62969d696206878f294e1db80c1af58c02bb433a
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 56d83740c9 Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: I637b82fd2c57ac45b5c28b74941cf1c80235e844
2021-08-31[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a am: 15f0db8ce8 Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: Ifb96ba1501e1a8a159b9862afc9de5eac3b8065a
2021-08-30[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseBill Yi
2573c7ce0a Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: I419b491e81c95bb4a89af7c728891b8f4f2a64d6
2021-08-30[automerge] Update fastboot version checking to 3103 to support P21 2p: ↵Bill Yi
2573c7ce0a Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/15720117 Change-Id: I72f1191f4e59b7689f8d396237d611643d301b1f
2021-08-30Update fastboot version checking to 3103 to support P21Bill Yi
This script is only used for packaging factory images by the AOSP team. It does not affect build. BUG: 182332166 Change-Id: I1a650df14a3fe49914025a02c70ee9728f32fb69
2021-06-22Merge "Make a copy of the COPYRIGHT file" am: a3a6ba684e am: 484c7e3369 am: ↵Treehugger Robot
db31e91198 am: 78da021045 Original change: https://android-review.googlesource.com/c/device/common/+/1740620 Change-Id: Id0e3992d20517da3695afb464028c89e203b7d80
2021-06-21Merge "Make a copy of the COPYRIGHT file" am: a3a6ba684e am: 484c7e3369 am: ↵Treehugger Robot
db31e91198 Original change: https://android-review.googlesource.com/c/device/common/+/1740620 Change-Id: Ibc55fa9feed7a91c0471856ca22744e58e402eec
2021-06-21Merge "Make a copy of the COPYRIGHT file" am: a3a6ba684e am: 484c7e3369android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/common/+/1740620 Change-Id: Icbe97bd4aa1d5b17bd55c50183b0d3c250663502
2021-06-21Merge "Make a copy of the COPYRIGHT file" am: a3a6ba684eTreehugger Robot
Original change: https://android-review.googlesource.com/c/device/common/+/1740620 Change-Id: I2993df8e27e0e7d2f7fc825e8a3be3f82629980b
2021-06-21Merge "Make a copy of the COPYRIGHT file"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
2021-06-21Make a copy of the COPYRIGHT fileBill Yi
BUG: 189477034 Change-Id: I671c32cb0507a1b67bbe52479f6643ddf674c980
2021-06-02Make a copy of the COPYRIGHT file am: 6b5f89ddbe am: c41301bad7 am: 8e90921fa6Bill Yi
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/14791187 Change-Id: Iecd43f68b25e061ab86aee02eccd5c2b65693fb1
2021-06-02Make a copy of the COPYRIGHT file am: 6b5f89ddbe am: ab27a789da am: 878a645dc8Bill Yi
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/14791187 Change-Id: I1a35de2fbbd48128edd3eea633d739be187ca114
2021-06-02Make a copy of the COPYRIGHT file am: 6b5f89ddbe am: c41301bad7Bill Yi
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/14791187 Change-Id: I4196a34eb0ec2887e8ccc9a2679de5fc234285ac
2021-06-02Make a copy of the COPYRIGHT file am: 6b5f89ddbe am: ab27a789daBill Yi
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/14791187 Change-Id: I4f80eef2a4f5340a11039af22933d6f05bc3b122
2021-06-02Make a copy of the COPYRIGHT file am: 6b5f89ddbeBill Yi
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/14791187 Change-Id: Ib29f30dea1f3c943510a702212d4544ae57f84c9
2021-06-02Make a copy of the COPYRIGHT file am: 6b5f89ddbeBill Yi
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/14791187 Change-Id: I78055ee39fc59e59dd5b15f578267c500ebef368
2021-06-01Make a copy of the COPYRIGHT fileandroid12-devBill Yi
BUG: 189477034 Change-Id: I893b3329e962528586c10499d95fd3d17b6b19dd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 85a2054f6e -s ↵Xin Li
ours am: 628f073ac1 -s ours am: 396d9758dc -s ours am skip reason: Change-Id Iadcec68d76d530e77de9f727202f34abb195562e with SHA-1 62a29ab8f3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2cc9f6f3fc4d01d2e263dda097d951b6a7ccc560
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 85a2054f6e -s ↵Xin Li
ours am: 628f073ac1 -s ours am skip reason: Change-Id Iadcec68d76d530e77de9f727202f34abb195562e with SHA-1 62a29ab8f3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib13822854b56b4d28adbc1791b8ac164fac4d171
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 85a2054f6e -s oursXin Li
am skip reason: Change-Id Iadcec68d76d530e77de9f727202f34abb195562e with SHA-1 62a29ab8f3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If7b7826f241c8bf4d440332e63f57057ee608db0
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: Iadcec68d76d530e77de9f727202f34abb195562e Change-Id: I6488b9194b9cf317cf2703b21d29d929bb55462f
2020-11-24Mark ab/6881855 as merged am: c671841032 am: 62a29ab8f3Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/13112083 Change-Id: Ie4f561e752f09b9ceeb87aeb70021112afea03ee
2020-11-24Mark ab/6881855 as merged am: c671841032Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/13112083 Change-Id: Iadcec68d76d530e77de9f727202f34abb195562e
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I9c4d8fafede82c680ffb9d3a6ce3c72b2c397fa4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2172978bdd -s ours am: ↵Xin Li
765cfcfdf6 -s ours am: 56c3109502 -s ours am skip reason: Change-Id I7fa2e7b22b65107e2bf205c54fe38a5dd15a07d3 with SHA-1 1ea2b45e64 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/12796108 Change-Id: I6a4c132f58c5facab2c415e3ef40621e5a1464b3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2172978bdd -s ours am: ↵Xin Li
765cfcfdf6 -s ours am skip reason: Change-Id I7fa2e7b22b65107e2bf205c54fe38a5dd15a07d3 with SHA-1 1ea2b45e64 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/12796108 Change-Id: I09c774b27bb9b949926d3a04cdb569ad7a56db75
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2172978bdd -s oursXin Li
am skip reason: Change-Id I7fa2e7b22b65107e2bf205c54fe38a5dd15a07d3 with SHA-1 1ea2b45e64 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/12796108 Change-Id: I868dd4d9e968c9f1b8b3033f89bfc2e9ae198e6b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I7fa2e7b22b65107e2bf205c54fe38a5dd15a07d3 Change-Id: I03385e3701eac60652c52a5e8b834b558fe4a0c1
2020-09-13[automerger skipped] Add product partition file support am: 9feca325c6 -s ↵Bill Yi
ours am: 3cdb8d085f -s ours am: 2c56592b1e -s ours am skip reason: Change-Id I201ac6c73a3658b38ae3790d9a90c9805f656ad5 with SHA-1 9feca325c6 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/11551158 Change-Id: Ied9fae4ee35bc8cc3e23d0dc6ab45b5fcfc0a6f2
2020-09-11[automerger skipped] Merge "Merge Android R" am: ff647abead -s ours am: ↵Xin Li
7f19b90148 -s ours am: c22efd5798 -s ours am: cd67b67573 -s ours am: 0c0a7a0135 -s ours am skip reason: Change-Id I58746745416a0abfe332709351ed21a99f5abd3b with SHA-1 62a7548a53 is in history Original change: https://android-review.googlesource.com/c/device/common/+/1421856 Change-Id: I2752e8d943ccd34aeb48fea22a3372789da0bbdf
2020-09-11[automerger skipped] Merge "Merge Android R" am: ff647abead -s ours am: ↵Xin Li
7f19b90148 -s ours am: c22efd5798 -s ours am: cd67b67573 -s ours am skip reason: Change-Id I58746745416a0abfe332709351ed21a99f5abd3b with SHA-1 62a7548a53 is in history Original change: https://android-review.googlesource.com/c/device/common/+/1421856 Change-Id: Ia39933fcb700964d3ae336df3a6e9ef94066c171
2020-09-11[automerger skipped] Merge "Merge Android R" am: ff647abead -s ours am: ↵Xin Li
7f19b90148 -s ours am: c22efd5798 -s ours am skip reason: Change-Id I58746745416a0abfe332709351ed21a99f5abd3b with SHA-1 62a7548a53 is in history Original change: https://android-review.googlesource.com/c/device/common/+/1421856 Change-Id: Iff83637e77015a18dc44a9bd9ef79a32906f92e6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 19:48:24 +0000