summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-11[automerger skipped] Empty merge of ↵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_330443060android-u-beta-1-gplandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-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_r16android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-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-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-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: c3364a1180 -s ours am: d9d5b48faf -s ours am skip reason: Merged-In I622887ec2621be1e8f46c5f8d7067ecae2cd984a with SHA-1 91de5bb89e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/16843855 Change-Id: I17851226834f3143c972e67b86815cc1b2e3c9f0
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: c3364a1180 -s ours am skip reason: Merged-In I622887ec2621be1e8f46c5f8d7067ecae2cd984a with SHA-1 91de5bb89e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/16843855 Change-Id: I665a0774c94ce53d6fe08e2ae606e61bfb524cfc
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I622887ec2621be1e8f46c5f8d7067ecae2cd984a Change-Id: Ibeccb57b6370f319c92207113e7c565da825c6da
2022-01-28Merge "Fix licenses and license texts." am: 6a8d5c3bb2 am: 02316f86aa am: ↵Treehugger Robot
fc5dbe43b5 am: f635d74b20 Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1964439 Change-Id: I2ad580e74a0bf362b68698f79a6d28384d1865eb
2022-01-28Merge "Fix licenses and license texts." am: 6a8d5c3bb2 am: 02316f86aa am: ↵Treehugger Robot
fc5dbe43b5 Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1964439 Change-Id: Ic96d98c5a5ff213c64572ec6bd7a5b2f55464e92
2022-01-28Merge "Fix licenses and license texts." am: 6a8d5c3bb2 am: 02316f86aaTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1964439 Change-Id: Iad197c1562c79d3e591957a1fde23e455d0810f6
2022-01-28Merge "Fix licenses and license texts." am: 6a8d5c3bb2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1964439 Change-Id: Ia775d79e7c748bd4c79ea82a0b2ae520c068c3bf
2022-01-28Merge "Fix licenses and license texts."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-1Treehugger Robot
2022-01-27Fix licenses and license texts.Bob Badour
Entire project is 1p. Test: m nothing Change-Id: I09327a1f93aa83cb5a9f9f56c92c55669f0dd0e6
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: ↵Xin Li
8faa4ced33 -s ours am: 59069153c9 -s ours am: 44e848479c -s ours am: 0b551fa42d -s ours am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: I0aae3f7651b2b84c64cbada527cee89739b3a0a0
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: ↵Xin Li
8faa4ced33 -s ours am: 59069153c9 -s ours am: 44e848479c -s ours am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: I4cc036d67b22ca203e07727deeb2b462b1973313
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: ↵Xin Li
8faa4ced33 -s ours am: 59069153c9 -s ours am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: Ic91e2d8ca8bb10d2c41c49bd019a9874febd55d4
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: ↵Xin Li
8faa4ced33 -s ours am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: I1b4fab7bd6909f2beff6a003139c96118316fa8c
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s oursXin Li
am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: I5c40bd5e40f0707aad8d6f892635c048d1fe38c4
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I203c591917c9da5b44f12c9822522e0f4cc15599 Change-Id: Ic1c7774558534033dd84dc681fa23afa6a876895
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a6ae5c949e -s ours am: 224e67288f -s ours am: cd2a49455e -s ours am: 8474a959f7 -s ours am skip reason: Merged-In I484fe79efdf22d5e7eec7d7bee43a7f622115244 with SHA-1 cc26be6127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15571809 Change-Id: I9a2b2fedfc90c9b38542aa4f04cbcf508ba827ec
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a6ae5c949e -s ours am: 224e67288f -s ours am: cd2a49455e -s ours am skip reason: Merged-In I484fe79efdf22d5e7eec7d7bee43a7f622115244 with SHA-1 cc26be6127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15571809 Change-Id: Ia6c21d08bfdce38dc71c01d87f0eb1b1696457a2
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a6ae5c949e -s ours am: 224e67288f -s ours am skip reason: Merged-In I484fe79efdf22d5e7eec7d7bee43a7f622115244 with SHA-1 cc26be6127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15571809 Change-Id: I7aa12f30a9a9c6958a1c27259511ce0081d6cb4b
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a6ae5c949e -s ours am skip reason: Merged-In I484fe79efdf22d5e7eec7d7bee43a7f622115244 with SHA-1 cc26be6127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15571809 Change-Id: I4a23795666e891a97df2cb769bc73e2eb84fec99
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I484fe79efdf22d5e7eec7d7bee43a7f622115244 Change-Id: I203c591917c9da5b44f12c9822522e0f4cc15599
2021-06-23Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: ↵Grace Jia
91de5bb89e am: cc26be6127 am: e7c6ea1268 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15053494 Change-Id: I304584972f1c4c9e68289fbe5fea18cdd412a9db
2021-06-23Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: ↵Grace Jia
91de5bb89e am: cc26be6127 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15053494 Change-Id: Ia5047f506c51b6a31c69612774265fa327b06f97
2021-06-22Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: ↵Grace Jia
91de5bb89e am: 5178929a5d am: 6dc4780316 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15053494 Change-Id: Ief2a10d735d97fcdce3a17efc6adb4d0d53c456b
2021-06-22Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: ↵Grace Jia
91de5bb89e am: 5178929a5d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15053494 Change-Id: Ib445d22ea653a4b831bb0324c13c781f3116f248
2021-06-22Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: ↵Grace Jia
91de5bb89e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15053494 Change-Id: I484fe79efdf22d5e7eec7d7bee43a7f622115244
2021-06-22Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: ↵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-releaseGrace Jia
91de5bb89e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15053494 Change-Id: Ibf6b7944af4a90216aeaf8cf15df581aec794f7d
2021-06-21Add READ_PHONE_NUMBERS permission to get phone account from Telecom.android-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devGrace Jia
Bug: 183407956 Test: UnitTest, CTS test Change-Id: I622887ec2621be1e8f46c5f8d7067ecae2cd984a (cherry picked from commit e072f8b83882177bdf4af88c7fe9e6b6cabc6345)
2021-06-09Add READ_PHONE_NUMBERS permission to get phone account from Telecom.Grace Jia
Bug: 183407956 Test: UnitTest, CTS test Change-Id: I622887ec2621be1e8f46c5f8d7067ecae2cd984a
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s ↵Xin Li
ours am: dac515acc9 -s ours am: 0831aab988 -s ours am skip reason: Change-Id Icb7b03ca404c32460b1bea7d94a4d891d707134b with SHA-1 f8600c44c7 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I891bf70f6928fe72ec6bb82407e977ee36b864b9
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider" am: 3d8f01b7a4 am: 64123569bf am: a13ac9e26d am: 67d9faeaed Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1588506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a95fa72d283bd43527db2a5353b1e3402604cb8
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s ↵Xin Li
ours am: dac515acc9 -s ours am skip reason: Change-Id Icb7b03ca404c32460b1bea7d94a4d891d707134b with SHA-1 f8600c44c7 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib57a1b916044a7965afc0a32668610ec2e22981b
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider" am: 3d8f01b7a4 am: 64123569bf am: a13ac9e26d Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1588506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5034737e6f9e091b6dd3594fa6ba26ee5ce4b56c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s oursXin Li
am skip reason: Change-Id Icb7b03ca404c32460b1bea7d94a4d891d707134b with SHA-1 f8600c44c7 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a888f4f9ae71ba335a097098868e4c247e3e49b
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Icb7b03ca404c32460b1bea7d94a4d891d707134b Change-Id: Ia79fee25e05205f539ed9b79a80ee12109db38b3
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider" am: 3d8f01b7a4 am: 64123569bf Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1588506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I969c3914373835b74739e5baa53108a60c8c8ff3
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider" am: 3d8f01b7a4 Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1588506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e50b5ba1191de7a361b451d8d9014da83f57f93
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider"
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/UserDictionaryProviderBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ica2eb13f0de778dfeeef702d9bb34fad9183d99e
2020-11-23Mark ab/6881855 as merged am: 059da03898 am: f8600c44c7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/13113005 Change-Id: Id327935d60f00f08736066309aaeffd907c9d5ab
2020-11-23Mark ab/6881855 as merged am: 059da03898Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/13113005 Change-Id: Icb7b03ca404c32460b1bea7d94a4d891d707134b
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I80430d89de2ecc4984db86ed1a0346092f34ec27
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s ours am: ↵Xin Li
29f9af1834 -s ours am: dbc31a5f41 -s ours am skip reason: Change-Id I25d173f4757e675caf00abd3eae2984e988e8ed4 with SHA-1 766f3fab08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12795834 Change-Id: I7ea96f942e6509b52a900420551c106c7ab19942
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s ours am: ↵Xin Li
29f9af1834 -s ours am skip reason: Change-Id I25d173f4757e675caf00abd3eae2984e988e8ed4 with SHA-1 766f3fab08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12795834 Change-Id: I2a5ce2492c61ae869be1991994faec35c5cde017
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s oursXin Li
am skip reason: Change-Id I25d173f4757e675caf00abd3eae2984e988e8ed4 with SHA-1 766f3fab08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12795834 Change-Id: I0dd2bea881c2927c2fb490d51c08bb9631975f0e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I25d173f4757e675caf00abd3eae2984e988e8ed4 Change-Id: I4251e0dbc6f77fde0c691163ae231b7417acf44c
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am: c6ebd53d8f -s ours am: 8d2d0dc093 -s ours am: f79a0fac2c -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: I801bed4a878209abdc25c34b84dde20f1da3fdcc
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am: c6ebd53d8f -s ours am: 8d2d0dc093 -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: Ia4de100ab2d03dc9a44d581e6e03d4bb5ff59631
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am: c6ebd53d8f -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: I81631224dee843930c5223b1d5bf085ff3595970
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: Idac35caffbc6921700f1ad98549b14bc80bdcb0c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 00:30:02 +0000