summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-02Merge sc-mainline-prodt_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-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_332714070aml_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_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_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid13-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-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-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-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I49d174004313d29d7e18479b21fce1174b0cc859
2021-05-17[automerger skipped] Add lint baseline to address NewApi errors am: ↵Pedro Loureiro
4e202a0b5f am: 3288e90171 am: 3f4ff92f8f -s ours am: 3bf5398f0a -s ours am: 84af3e67e3 -s ours am skip reason: Merged-In I508595cc357d19a90164f9573e4ee1f1f2e3f6d8 with SHA-1 35433f9609 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1675806 Change-Id: I95ae74e8f53ee099735dda9273d401417a6fbb7c
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵Pedro Loureiro
4e202a0b5f am: 3288e90171 am: 3f4ff92f8f -s ours am: 3bf5398f0a -s ours am skip reason: skip tag Change-Id I508595cc357d19a90164f9573e4ee1f1f2e3f6d8 with SHA-1 35433f9609 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1675806 Change-Id: I7a9b29ed7a952756c4079be589ce1a54a0ba45b8
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-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_r12android12L-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-releasePedro Loureiro
4e202a0b5f am: 3288e90171 am: 3f4ff92f8f -s ours am: 3bf5398f0a -s ours am skip reason: skip tag Change-Id I508595cc357d19a90164f9573e4ee1f1f2e3f6d8 with SHA-1 35433f9609 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1675806 Change-Id: I02c09bc1e1ec196dbfb3cc94e471eb2c614f9de5
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵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-releasePedro Loureiro
4e202a0b5f am: 3288e90171 am: 3f4ff92f8f -s ours am: 3bf5398f0a -s ours am skip reason: skip tag Change-Id I508595cc357d19a90164f9573e4ee1f1f2e3f6d8 with SHA-1 35433f9609 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1675806 Change-Id: Ic3d690092c444a66c328a6e2297187e8c418ebc6
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-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_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-devandroid12-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-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Pedro Loureiro
4e202a0b5f am: 3288e90171 am: 3f4ff92f8f -s ours am skip reason: skip tag Change-Id I508595cc357d19a90164f9573e4ee1f1f2e3f6d8 with SHA-1 35433f9609 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1675806 Change-Id: Iccbfa379b027ed1d2bc5b984469ae9bb251513f9
2021-04-15Add lint baseline to address NewApi errors am: 4e202a0b5f am: 3288e90171Pedro Loureiro
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1675806 Change-Id: Icc0b9509f31e05c0cb7c60b3adde7aa859f5021e
2021-04-15Add lint baseline to address NewApi errors am: 4e202a0b5fandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Pedro Loureiro
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1675806 Change-Id: I483bb82bbdb93cdce04054b6695571bc5617f7e2
2021-04-13Add lint baseline to address NewApi errors am: 35433f9609Pedro Loureiro
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/13710566 Change-Id: Ia98e928b5d54aea16ab310a171e3f089fdaa4da2
2021-04-13Add lint baseline to address NewApi errorsandroid-s-beta-2android-s-beta-1Pedro Loureiro
We are enabling a new lint check where the min sdk != compile sdk. It has produced a lot of errors and adding the baseline file(s) allows us to continue work without introducing more problems. Bug: 150847901 Test: m lint-check Change-Id: I508595cc357d19a90164f9573e4ee1f1f2e3f6d8 Merged-In: I508595cc357d19a90164f9573e4ee1f1f2e3f6d8
2021-04-13Add lint baseline to address NewApi errors am: 35433f9609Pedro Loureiro
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/13710566 Change-Id: I8fae021c315add8a744a1f0c7e06b467a5a091a3
2021-04-12Add lint baseline to address NewApi errorsPedro Loureiro
We are enabling a new lint check where the min sdk != compile sdk. It has produced a lot of errors and adding the baseline file(s) allows us to continue work without introducing more problems. Bug: 150847901 Test: m lint-check Change-Id: I508595cc357d19a90164f9573e4ee1f1f2e3f6d8
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/setupwizard am: 0b5a1a89af ↵Bob Badour
am: d6061f232e am: 2fc325df45 am: 929cf82a32 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1574781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ac8f2347279d20f33fe79d5d2ad2701b408e977
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/setupwizard am: 0b5a1a89af ↵Bob Badour
am: d6061f232e am: 2fc325df45 am: 929cf82a32 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1574781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ed139c65dac3c56364500df01334b6ac72f5117
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/setupwizard am: 0b5a1a89af ↵Bob Badour
am: d6061f232e am: 2fc325df45 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1574781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic7e6774b834e8b593678f0159bbdd7ca60942b27
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/setupwizard am: 0b5a1a89af ↵Bob Badour
am: d6061f232e Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1574781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If0bc4398f5606efe85e139074a6a536d96e52ecb
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/setupwizard am: 0b5a1a89afBob Badour
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1574781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62b22549113325950d4cbfa1da20147c938bf2da
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/setupwizardandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: library/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I75126f991d5d337575d5b2343e2ba3d61ef3e7da
2020-09-11[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am: ba660c4ec7 ↵Xin Li
-s ours am: 42884748d3 -s ours am: fbc0f3504f -s ours am: 9bb7dc7c16 -s ours am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1421778 Change-Id: I7559a577ecf4497c5d6590462aa1c4e59fda3ed5
2020-09-11[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am: ba660c4ec7 ↵Xin Li
-s ours am: 42884748d3 -s ours am: fbc0f3504f -s ours am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1421778 Change-Id: I605843c9dacffa0d07d70758fe07ba3fb1fd0c82
2020-09-11[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am: ba660c4ec7 ↵Xin Li
-s ours am: 42884748d3 -s ours am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1421778 Change-Id: Ie9b6dc641bb2378241a308a76df95917e563df80
2020-09-11[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am: ba660c4ec7 ↵Xin Li
-s ours am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1421778 Change-Id: If39c493093e746b7bb1c49d24b6510f47c578e45
2020-09-11[automerger skipped] Merge Android R am: 19f9fc18c9 -s oursXin Li
am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/1421778 Change-Id: I021f4f48a830c1cedcac45f429f8f94660ac6aa9
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I4e01fbf5d6fd342573625b6e3ad0c2a387432920 Change-Id: Ibe1448b925ebe41ea8fa9ed4c76e5291df6bf2eb
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 801d339361 -s ours am: 75f61b59c5 -s ours am: 34b3396a8f -s ours am: d1df96afb1 -s ours am skip reason: Change-Id I3a6d30448b2248807a5edf579f72bb6ed885b75e with SHA-1 8d2737e20a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/12470188 Change-Id: I52f8e41cb97261549e777023456281ba5e57038c
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 801d339361 -s ours am: 75f61b59c5 -s ours am: 34b3396a8f -s ours am skip reason: Change-Id I3a6d30448b2248807a5edf579f72bb6ed885b75e with SHA-1 8d2737e20a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/12470188 Change-Id: If77f53a67d636dbe5d8822db451f93c299800fc7
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 801d339361 -s ours am: 75f61b59c5 -s ours am skip reason: Change-Id I3a6d30448b2248807a5edf579f72bb6ed885b75e with SHA-1 8d2737e20a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/12470188 Change-Id: I239c72123ac55181368d71c5eb82e0ef135e7190
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 801d339361 -s ours am skip reason: Change-Id I3a6d30448b2248807a5edf579f72bb6ed885b75e with SHA-1 8d2737e20a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/12470188 Change-Id: Idc95c9ff8ce5fdb457435e55f40b50443a019f02
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I3a6d30448b2248807a5edf579f72bb6ed885b75e Change-Id: I4e01fbf5d6fd342573625b6e3ad0c2a387432920
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: 82f1008f94 am: 481c220b0b -s ours am skip reason: subject contains skip directive Change-Id: I3a6d30448b2248807a5edf579f72bb6ed885b75e
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: 82f1008f94 Change-Id: I880d7317d1d1224f2c4c6631a173a0ad34eac7db
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: I47fa4ba4ec61055b7744a6574916e4d8cf8dcc1d
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 260cab7892 -s ours am: 1b06528325 -s ours am: d1f953fad8 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: I45ce7f338e7b43ab807b8dc94084d91afe56c41a
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 260cab7892 -s ours am: 1b06528325 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: Ieac914597192851fafec2ef3fa3b009bd1f23877
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 260cab7892 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: Ied17a74ac75304af1e2f6fd0bb804293789e3cec
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I65ad12e59bb1b4e0e2d894283fa7e5e91c766d5a Merged-In: I38429ee13989d447b1350d9f098d22786c2e9447
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
3343873fa1 -s ours am: 8d58738c9f am: 2cdd50295e am: 5d7bf4dce5 -s ours am skip reason: subject contains skip directive Change-Id: I3dc885aef58c77ce295ff67d8e057d86597eb266
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
3343873fa1 -s ours am: 8d58738c9f am: 2cdd50295e Change-Id: Ie14f404ff1f467c487b67b4bb777f8d9f4ffb0e8
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
3343873fa1 -s ours am: 8d58738c9f Change-Id: Ib3fed937c9f5bf4f8f803a92c034bd91950a0a91
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 3343873fa1 -s ours am skip reason: subject contains skip directive Change-Id: I1456af3df971e2b8aef08d1b5ce72249861a2486
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I38429ee13989d447b1350d9f098d22786c2e9447
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: aa06a98b93 am: f51db88f7e -s ours am skip reason: subject contains skip directive Change-Id: I4989e4bd104fdf24d7124852d37213e4259077db
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: aa06a98b93 Change-Id: I4e7d97a7c2a75aa5ad439fcc68f07c159931c0b8
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I5e74b54945db4e896b45312ec51d2a4facc01c55
2019-05-31Update owners file for setup wizard libMaurice Lam
Test: None Change-Id: I42094c9d84f2d963d2470579223e12cf25eec45a
2019-05-17[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am: f26a9e8e2e -s ours am: 93dacd74ef am: c504e1f5f8 -s ours am skip reason: subject contains skip directive Change-Id: I116917b5646b385e4962d128920a0b0120da0b5b
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am: f26a9e8e2e -s ours am: 93dacd74ef Change-Id: Ia58457aba3b6a96b1098c3feb99d017c7a75bfab
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am: f26a9e8e2e -s ours am skip reason: subject contains skip directive Change-Id: I7cb26cfa07d5b3e8e3bad5b24690dae0a6877255
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: 3df8ec6322 -s ours am skip reason: subject contains skip directive Change-Id: I712ad83436692f6a78d74e428291f30dd479f3db
2019-05-16[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190505.001) into stage-aosp-master am: 9bff145e87 -s ours am: 348f81ec4c am: 4eba75a761 -s ours am skip reason: subject contains skip directive Change-Id: If497850e5c0f942690eb4fd8ca0aa4b9b4fba942
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 20:16:37 +0000