summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-01Snap for 9447015 from 639e1247c8f97734e1a0caefdb9170b7fd8e0b4d to ↵android-13.0.0_r49android-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-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-releaseAndroid Build Coastguard Worker
tm-qpr2-release Change-Id: Id25c66e53e1b58b4217860e2efa9032774158c33
2022-12-29Import translations. DO NOT MERGE ANYWHEREandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-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-releaseBill Yi
Auto-generated-cl: translation import Change-Id: I2fb61f9a6cf4d61753118c4bf9b381c890297b38
2022-12-21Snap for 9424627 from 80e21ad184b27de9d26f63fc242ee42aa95d982f to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: If5381b40d4924062bdbbe2a9f82385d2fd96eb42
2022-12-18Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5a8b1ef50b5901a820698ec3451df3646458c5a3
2022-10-03Snap for 9133013 from 11c607b75766dbc2024f8d63f7a8870fc45b77ea to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: If72e4f5fc8a4e73fdc42e173b4446257d7e93370
2022-09-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
43e48ac696 -s ours am: c0a705f8a7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/19843294 Change-Id: Ib23dc5ad8a391134912f4b292280948fc1aebfbf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
43e48ac696 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/19843294 Change-Id: I9be8d597a97517309fd81893b84506b6e90f13a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
69eb44f4ab -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/19843295 Change-Id: If80e28b0c5834e957898198f275e80eada700736 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iacd55f6be29cc53be963778c7760d4c2793123a6
2022-09-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idec5d865f4ed7c8b5e4dfde3bed1d12a7604b54f
2022-08-31Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1de04b468e56d11027facf0c40499c230e628854
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 80020b6217 -s ours ↵Xin Li
am: 093487c19a -s ours am: ddd2f63ef7 -s ours am: ff1d9fb19f -s ours am skip reason: Merged-In If48ec18ead389648326581322b064434a9741d4a with SHA-1 90fa573d0e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/17544790 Change-Id: I2e9719277aa5807151e88067788d039043ac32fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 80020b6217 -s ours ↵Xin Li
am: 093487c19a -s ours am: ddd2f63ef7 -s ours am skip reason: Merged-In If48ec18ead389648326581322b064434a9741d4a with SHA-1 90fa573d0e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/17544790 Change-Id: I99bfa96479a8ef765e6d79112899124e2cb1c38c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 80020b6217 -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
am: 093487c19a -s ours am skip reason: Merged-In If48ec18ead389648326581322b064434a9741d4a with SHA-1 90fa573d0e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/17544790 Change-Id: I00d938fb80812ad0bd6738b42da0ad59effe974e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 80020b6217 -s ourstemp_sam_236045730Xin Li
am skip reason: Merged-In If48ec18ead389648326581322b064434a9741d4a with SHA-1 90fa573d0e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/17544790 Change-Id: Id55007ec7b38022743ce26f023425b14af092b7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: If48ec18ead389648326581322b064434a9741d4a Change-Id: I2a58dac5ff2b61aefde111a7c520241fed629448
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
11864eb9d9 -s ours am: e1dc6ba661 -s ours am: 90fa573d0e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2045911 Change-Id: Iea6a6b6b6166897f8101e952ec7e7f09804b397d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e788160c5d -s ours am: 81fc1cad70 -s ours am: 37881d8cb4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2045911 Change-Id: I0b6f2df2da7feac521e5caf4b17ba07c7b950ba9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
640379160b -s ours am: c857006f72 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/17422224 Change-Id: I48cd455f895ec044c8952a01df5569a2f23d67c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
11864eb9d9 -s ours am: e1dc6ba661 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2045911 Change-Id: If48ec18ead389648326581322b064434a9741d4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e788160c5d -s ours am: 81fc1cad70 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2045911 Change-Id: I654764515001f499669fc71c2b52fd97e9a33d23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
640379160b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/17422224 Change-Id: I5cecfafb149b948719f86980b0cb5928eb9c94fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
11864eb9d9 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2045911 Change-Id: If183e2e6b136e8dd0d5d03628d609c4305e3b0fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e788160c5d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2045911 Change-Id: I919ba637e795383ee1bab7f2a6383b5f66962c6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1926e767e5d809c495e9f203e96580f1c7ff235a
2022-03-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9bf68323f9e50935fb6f92242e00be560c0b6315
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: b41f2507ec -s ours am: f9e26a4373 -s ours am skip reason: Merged-In I0af5291c0f8506eeb078ca1515249b9b1b6ff880 with SHA-1 e2ca493505 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/16843854 Change-Id: I4fd3aa84852a06e113275a73ecb25ed6cc7759d4
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: b41f2507ec -s ours am skip reason: Merged-In I0af5291c0f8506eeb078ca1515249b9b1b6ff880 with SHA-1 e2ca493505 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/16843854 Change-Id: I995d293c7deb1706150b80109c98d44557517b87
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I0af5291c0f8506eeb078ca1515249b9b1b6ff880 Change-Id: I04264a3c7819c3c81d77e25abb8bd7f12711fe2c
2022-01-28Merge "Fix licenses and license texts." am: e659fa4df0 am: 77ba2bc713 am: ↵Treehugger Robot
691db1b885 am: a0ee864032 Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1964359 Change-Id: Ie4b04e391bda2de30376281bed15fd91fce2774b
2022-01-28Merge "Fix licenses and license texts." am: e659fa4df0 am: 77ba2bc713 am: ↵Treehugger Robot
691db1b885 Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1964359 Change-Id: Ia403dff11ee9cde3c6e8bc6c2dad4c0eda0bb4ea
2022-01-28Merge "Fix licenses and license texts." am: e659fa4df0 am: 77ba2bc713Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1964359 Change-Id: Ib1a78fa96f4714b2c2ed6c525b4e359342a74e1e
2022-01-28Merge "Fix licenses and license texts." am: e659fa4df0Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1964359 Change-Id: Ie64546b1a07c2299c96845e4172eea27511e6e6e
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: I4e5874db6c0aee8b442b70d0e459a7c2838c08d6
2021-10-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ied03b9648236e9af86ce02e5b32b710bdd032d9f
2021-10-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic5cc550bc9c6e349da04e417f18a5482a6a71d77
2021-10-09Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iad47ae5e9c0da53fbd7762f82523ba7a0d43fe80
2021-10-08[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours am: ↵Xin Li
fdbc0c96dd -s ours am: 717a852178 -s ours am: 0f74fbfdb6 -s ours am: 55207bf228 -s ours am skip reason: Merged-In I048709a2a2e1d782131e1260b8e675ce409dc150 with SHA-1 7b2d3309b8 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1847707 Change-Id: I2e1a4469c0df0fe2d4665cf0269b824516a12fc4
2021-10-08[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours am: ↵Xin Li
fdbc0c96dd -s ours am: 717a852178 -s ours am: 0f74fbfdb6 -s ours am skip reason: Merged-In I048709a2a2e1d782131e1260b8e675ce409dc150 with SHA-1 7b2d3309b8 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1847707 Change-Id: I301ffbfd141893c73b4c3b90b3830330ed43fc2e
2021-10-08[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours am: ↵Xin Li
fdbc0c96dd -s ours am: 717a852178 -s ours am skip reason: Merged-In I048709a2a2e1d782131e1260b8e675ce409dc150 with SHA-1 7b2d3309b8 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1847707 Change-Id: I6af583b9495437bd806a02a1b434db91f059dc51
2021-10-08Merge "UM.getUserHandle -> UM.getProcessUserId"Adam Bookatz
2021-10-08[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours am: ↵Xin Li
fdbc0c96dd -s ours am skip reason: Merged-In I048709a2a2e1d782131e1260b8e675ce409dc150 with SHA-1 7b2d3309b8 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1847707 Change-Id: I95556e519254807f0bdcc8f0e54d5cab4ef89869
2021-10-08[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s oursXin Li
am skip reason: Merged-In I048709a2a2e1d782131e1260b8e675ce409dc150 with SHA-1 7b2d3309b8 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/1847707 Change-Id: I0d302c8ffacb6e4eba20461ccccbe6b6a710fa6f
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: I048709a2a2e1d782131e1260b8e675ce409dc150 Change-Id: Ifec1c0965c0620f6e25cab0be414040a9b5c3fff
2021-10-06Update the docs for CalendarProvider reference in strings.Varun Shah
Bug: 184773323 Change-Id: I67b37f18147aac4e941c53921d20d7d322288afc Test: n/a
2021-10-05UM.getUserHandle -> UM.getProcessUserIdAdam Bookatz
UM is being made @UserHandleAware, so using an explicit method avoids ambiguity. Bug: 201679968 Test: (No-op) compiles and treehugger Change-Id: If8a43717495cc23c3943c9a4238636c3930bb7f1
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7b2d3309b8 -s ours am: 6d8e0945cc -s ours am: 1c18f3ac09 -s ours am: fe84edbf77 -s ours am skip reason: Merged-In I95a48cbc91399c2d8c8396689eae8e9b34dadc66 with SHA-1 e5dc864215 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/15571803 Change-Id: I6ffbce22658db2dd71abe2ef584bc750afa5b4a4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 07:40:39 +0000