Bug: 130040385

Clone this repo:
  1. 0fd2032 [automerger skipped] Merge Android 12 am: 027d657a40 -s ours am: 5e036f2dd8 -s ours am: 87d11ba4d3 -s ours am: 3161a549fb -s ours am: a4d483db39 -s ours by Xin Li · 1 year, 4 months ago android13-dev android13-frc-adbd-release android13-frc-art-release android13-frc-cellbroadcast-release android13-frc-conscrypt-release android13-frc-documentsui-release android13-frc-extservices-release android13-frc-ipsec-release android13-frc-media-release android13-frc-media-swcodec-release android13-frc-networking-release android13-frc-neuralnetworks-release android13-frc-os-statsd-release android13-frc-permission-release android13-frc-resolv-release android13-frc-scheduling-release android13-mainline-adservices-release android13-mainline-appsearch-release android13-mainline-art-release android13-mainline-go-adbd-release android13-mainline-go-adservices-release android13-mainline-go-appsearch-release android13-mainline-go-art-release android13-mainline-go-cellbroadcast-release android13-mainline-go-conscrypt-release android13-mainline-go-documentsui-release android13-mainline-go-extservices-release android13-mainline-go-ipsec-release android13-mainline-go-media-release android13-mainline-go-media-swcodec-release android13-mainline-go-mediaprovider-release android13-mainline-go-networking-release android13-mainline-go-neuralnetworks-release android13-mainline-go-odp-release android13-mainline-go-os-statsd-release android13-mainline-go-permission-release android13-mainline-go-resolv-release android13-mainline-go-scheduling-release android13-mainline-go-sdkext-release android13-mainline-go-tethering-release android13-mainline-go-tzdata4-release android13-mainline-go-uwb-release android13-mainline-go-wifi-release android13-mainline-networking-release android13-mainline-tzdata4-release android13-mainline-uwb-release android13-qpr1-release android13-qpr1-s1-release android13-qpr1-s2-release android13-qpr1-s3-release android13-qpr1-s4-release android13-qpr1-s5-release main-16k main-16k-with-phones master aml_ads_331131000 aml_art_331012050 aml_art_331113000 aml_ase_331011020 aml_ase_331112000 aml_go_adb_330913000 aml_go_ads_330913000 aml_go_art_330913000 aml_go_ase_330913000 aml_go_cbr_330912000 aml_go_con_330913000 aml_go_doc_330912000 aml_go_ext_330912000 aml_go_ips_330911000 aml_go_med_330913000 aml_go_mpr_330912000 aml_go_net_330913000 aml_go_neu_330912000 aml_go_odp_330912000 aml_go_per_330912000 aml_go_res_330912000 aml_go_sch_330911000 aml_go_sdk_330810000 aml_go_sta_330911000 aml_go_swc_330913000 aml_go_tet_330914010 aml_go_tz4_330912000 aml_go_uwb_330912000 aml_go_wif_330911000 aml_net_330811010 aml_net_330910010 aml_net_331011030 aml_net_331110020 aml_tz4_331012000 aml_tz4_331012040 aml_tz4_331012050 aml_uwb_330810010 aml_uwb_331015040 aml_uwb_331115000 android-13.0.0_r16 android-13.0.0_r17 android-13.0.0_r18 android-13.0.0_r19 android-13.0.0_r20 android-13.0.0_r21 android-13.0.0_r22 android-13.0.0_r23 android-13.0.0_r24 t_frc_adb_330444000 t_frc_art_330443060 t_frc_ase_330444010 t_frc_cbr_330443000 t_frc_con_330443020 t_frc_doc_330443000 t_frc_doc_330443060 t_frc_ext_330443000 t_frc_ips_330443010 t_frc_med_330443030 t_frc_net_330443000 t_frc_neu_330443000 t_frc_neu_330443030 t_frc_odp_330442000 t_frc_per_330444010 t_frc_res_330443000 t_frc_sch_330443010 t_frc_sch_330443040 t_frc_sta_330443010 t_frc_swc_330443010 t_frc_swc_330443040 t_frc_tz4_330443010
  2. a4d483d [automerger skipped] Merge Android 12 am: 027d657a40 -s ours am: 5e036f2dd8 -s ours am: 87d11ba4d3 -s ours am: 3161a549fb -s ours by Xin Li · 1 year, 4 months ago
  3. 3161a54 [automerger skipped] Merge Android 12 am: 027d657a40 -s ours am: 5e036f2dd8 -s ours am: 87d11ba4d3 -s ours by Xin Li · 1 year, 4 months ago android-s-qpr3-beta-1 android-s-v2-beta-3 android-t-preview-1 android-s-qpr3-beta-1 android-s-v2-beta-3 android-t-beta-3 android-t-preview-1 android-t-preview-2
  4. 87d11ba [automerger skipped] Merge Android 12 am: 027d657a40 -s ours am: 5e036f2dd8 -s ours by Xin Li · 1 year, 4 months ago
  5. 5e036f2 [automerger skipped] Merge Android 12 am: 027d657a40 -s ours by Xin Li · 1 year, 4 months ago
  6. 027d657 Merge Android 12 by Xin Li · 1 year, 4 months ago android-s-v2-preview-1 android-s-v2-beta-2 android-s-v2-preview-1 android-s-v2-preview-2
  7. bb0a438 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 193c760b4b -s ours am: 5c35d6f4f7 -s ours am: e07664165f -s ours am: 6f47d8649e -s ours by Xin Li · 1 year, 6 months ago
  8. 6f47d86 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 193c760b4b -s ours am: 5c35d6f4f7 -s ours am: e07664165f -s ours by Xin Li · 1 year, 6 months ago
  9. e076641 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 193c760b4b -s ours am: 5c35d6f4f7 -s ours by Xin Li · 1 year, 6 months ago
  10. 5c35d6f [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 193c760b4b -s ours by Xin Li · 1 year, 6 months ago
  11. 193c760 Merge sc-dev-plus-aosp-without-vendor@7634622 by Xin Li · 1 year, 6 months ago
  12. 1044376 Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 am: dde3732b08 am: ddc9f85146 am: 71e564b977 by Yuntao Xu · 1 year, 9 months ago
  13. 9ad6e80 Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 am: dde3732b08 am: 2c0cf11470 am: 1d27f8c876 by Yuntao Xu · 1 year, 9 months ago
  14. 062cb81 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/SampleLocationAttribution am: 6d7a56d4b4 am: 2036c2ed0e am: 352b31d43b am: c3be05c5eb am: 1a055ec005 by Bob Badour · 1 year, 9 months ago
  15. 71e564b Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 am: dde3732b08 am: ddc9f85146 by Yuntao Xu · 1 year, 9 months ago
  16. 1d27f8c Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 am: dde3732b08 am: 2c0cf11470 by Yuntao Xu · 1 year, 9 months ago
  17. 2c0cf11 Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 am: dde3732b08 by Yuntao Xu · 1 year, 9 months ago android12L-d2-release android12L-d2-s1-release android12L-d2-s2-release android12L-d2-s3-release android12L-d2-s4-release android12L-d2-s5-release android12L-d2-s6-release android12L-d2-s7-release android12L-d2-s8-release android-12.1.0_r12 android-12.1.0_r13 android-12.1.0_r14 android-12.1.0_r15 android-12.1.0_r16 android-12.1.0_r17 android-12.1.0_r18 android-12.1.0_r23 android-12.1.0_r24 android-12.1.0_r25 android-12.1.0_r26
  18. ddc9f85 Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 am: dde3732b08 by Yuntao Xu · 1 year, 9 months ago
  19. 4027e58 Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 am: dde3732b08 by Yuntao Xu · 1 year, 9 months ago
  20. dde3732 Convert Android.mk to Android.bp am: db999d6341 am: b41a26429f am: 77c3522420 by Yuntao Xu · 1 year, 9 months ago android12-dev android12-qpr1-d-release android12-qpr1-d-s1-release android12-qpr1-d-s2-release android12-qpr1-d-s3-release android12-qpr1-release android12-qpr3-release android12-qpr3-s1-release android12-qpr3-s2-release android12-qpr3-s3-release android12-qpr3-s4-release android12-qpr3-s5-release android12-qpr3-s6-release android12-qpr3-s7-release android12L-dev android-12.0.0_r16 android-12.0.0_r18 android-12.0.0_r19 android-12.0.0_r20 android-12.0.0_r21 android-12.0.0_r26 android-12.0.0_r27 android-12.0.0_r28 android-12.0.0_r29 android-12.0.0_r32 android-12.1.0_r10 android-12.1.0_r11 android-12.1.0_r19 android-12.1.0_r20 android-12.1.0_r21 android-12.1.0_r22 android-12.1.0_r7 android-12.1.0_r8 android-12.1.0_r9