summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-08Merge "Migrate Test Targets to New Android Ownership Model" into main am: ↵HEADmastermainTreehugger Robot
879bae4b48 Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2944147 Change-Id: I6465992a76cc2cdbd968728ab25dcc3714ed78b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08Merge "Migrate Test Targets to New Android Ownership Model" into mainTreehugger Robot
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I9283f74abf03aee287e09439a38c65390fb28841
2023-01-04Import translations. DO NOT MERGE ANYWHEREandroid-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_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devBill Yi
Auto-generated-cl: translation import Change-Id: Id70649a44cbec2b8b505d52f89850095d8711413
2023-01-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
fac3c9ef3d -s ours am: d2e2a05afc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/20847253 Change-Id: I4d18e16c08b47e74347cf85b14d8f74c03c4db9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android-u-beta-1-gplBill Yi
fac3c9ef3d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/20847253 Change-Id: I5edf8f1006ecf918f9cb4cf6eef5b9c72c034b51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: Icdbcd746320a9a871e300fcee3658c302785bbb3
2022-12-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I68bb65362e9e96a11370d820dba04c67c60bcae5
2022-12-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
330e5d8be6 -s ours am: 70b853d680 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/20781222 Change-Id: I5098b1a67db760a7dbefd50ffda86714340f1ad0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
330e5d8be6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/20781222 Change-Id: I773aa00946c5289542928ba3b7ad62300fdd9030 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-18Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie76adedf2107b2902650b6c3e3b2dc9de4ff7def
2022-09-24Merge "Add FLAG_IMMUTABLE to PendingIntents" am: 78f856db7f am: 8f4518cbc6 ↵Treehugger Robot
am: 728100c859 am: aa439b05e7 am: b417cf7e31 Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2229419 Change-Id: I0c06f00993bcfa22c152fe88ab80184867dfb1c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24Merge "Add FLAG_IMMUTABLE to PendingIntents" am: 78f856db7f am: 8f4518cbc6 ↵main-16k-with-phonesTreehugger Robot
am: 728100c859 am: aa439b05e7 Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2229419 Change-Id: I54cd2aa0bb8b4bf4e9b98ed674bb27ccea973d34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24Merge "Add FLAG_IMMUTABLE to PendingIntents" am: 78f856db7f am: 8f4518cbc6 ↵Treehugger Robot
am: 728100c859 Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2229419 Change-Id: I605f41cfc1a9bd3bc7a2bc7c324b2a72e3543b20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24Merge "Add FLAG_IMMUTABLE to PendingIntents" am: 78f856db7f am: 8f4518cbc6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2229419 Change-Id: I4b0344be312729c717afcbdf41acdfa50d8066cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24Merge "Add FLAG_IMMUTABLE to PendingIntents" am: 78f856db7fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2229419 Change-Id: I7005f35b3b302f5d2c15fc42f08caa30543e8c17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24Merge "Add FLAG_IMMUTABLE to PendingIntents"main-16kTreehugger Robot
2022-09-23Add FLAG_IMMUTABLE to PendingIntentsCole Faust
If your app targets Android 12, you must specify the mutability of each PendingIntent object that your app creates. This additional requirement improves your app's security. https://developer.android.com/about/versions/12/behavior-changes-12#pending-intent-mutability Android Lint is being updated, and adds an error-level check for this. Bug: 247885568 Test: Presubmits Change-Id: Ic658d2423e6db48383a84c44a86d50c2d17ede74
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7bfecbd626 ↵Xin Li
-s ours am: fda0e219f2 -s ours am: 82a6dc1b80 -s ours am: c33afdfa13 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: If1c5c8da6d282d1a13ab11a3b52690eb09ea0e33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: ea55e43c68 -s ours ↵Xin Li
am: d27786e307 -s ours am: b80e7b3f83 -s ours am: 424da0e050 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: I7420c142cd87ce365cc2589cb9279e0782b36468 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7bfecbd626 ↵Xin Li
-s ours am: fda0e219f2 -s ours am: 82a6dc1b80 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: Id692211c7751456473b334a707266ebcf291fe1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: ea55e43c68 -s ours ↵Xin Li
am: d27786e307 -s ours am: b80e7b3f83 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: I289b09fb0caccf66d35de93b581229f5eccc8d12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7bfecbd626 ↵Xin Li
-s ours am: fda0e219f2 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: I04d375a787a7f29c986e0f71b1dfeb96dfd41021 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: ea55e43c68 -s ours ↵Xin Li
am: d27786e307 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: I2fd7bc1bcfed427231776544b554dff02579cbe7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 7bfecbd626 ↵Xin Li
-s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: Ic2de466ae5a8d8d9c5b47a9eb4184a01f127f4f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: ea55e43c68 -s oursXin Li
am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2186827 Change-Id: I8e1a30c96af548689b69d8e03e534ac311870d67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16Merge "DO NOT MERGE - Merge Android 13"Xin Li
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I143ba83a708f8726891d81101a3c420315a334c6 Change-Id: Id6920c24718e7baa9ac04c49a4a5f13dc50c999b
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2908af4396 -s ours am: 9595a04912 -s ours am: b599fe3c84 -s ours am: 546dad60f0 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/19094766 Change-Id: Ic69332300d4cfa1aa4a11edb4fa02800faa43666 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2908af4396 -s ours am: 9595a04912 -s ours am: b599fe3c84 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/19094766 Change-Id: I288b65679c52b81dc1d23a10d5d25c2cbbad81a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2908af4396 -s ours am: 9595a04912 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/19094766 Change-Id: I5c6aebc39fcd132f5bf6c5a8a9ee105a55b371a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
2908af4396 -s ours am skip reason: Merged-In I143ba83a708f8726891d81101a3c420315a334c6 with SHA-1 920aea6898 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/19094766 Change-Id: Ibc3a3ae211a4c64eea748b8a85aac5d4a9987860 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I143ba83a708f8726891d81101a3c420315a334c6 Change-Id: Iaaedc438aa05a7e5a36e803efc9f792a2fd3808a
2022-06-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
920aea6898 -s ours am: a6fb62131a -s ours am: ccdc416cda -s ours am: 58804186bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/18753410 Change-Id: Ic529c6fde8c748d115ec000b7104f67a2686f446 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
920aea6898 -s ours am: a6fb62131a -s ours am: ccdc416cda -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/18753410 Change-Id: I3d1c07b582f84ce1f6ac081d22249ac159590918 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
920aea6898 -s ours am: a6fb62131a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/18753410 Change-Id: I2c8c30b04b5d80dea21f774ea43e758c93577add Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
920aea6898 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/18753410 Change-Id: I282ce0c56b7b7fdffcf1ab437f069a9574c0ca84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I143ba83a708f8726891d81101a3c420315a334c6
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 95ffcc129a -s ours ↵Xin Li
am: 9f50e3bc76 -s ours am: 3f4265aaf1 -s ours am: 0d07ad8a4f -s ours am: c15478a34d -s ours am skip reason: Merged-In If2d442a524f007c46e864ae5256993ca7d39d905 with SHA-1 fe0576ad60 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/17544755 Change-Id: Ie0ad807cb283242dea89695596a400cb9550a5f4 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: 95ffcc129a -s ours ↵android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseXin Li
am: 9f50e3bc76 -s ours am: 3f4265aaf1 -s ours am: 0d07ad8a4f -s ours am skip reason: Merged-In If2d442a524f007c46e864ae5256993ca7d39d905 with SHA-1 fe0576ad60 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/17544755 Change-Id: I9bb98ba521dfaea5cd2ad69f9458d08ccf4b4ee0 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: 95ffcc129a -s ours ↵Xin Li
am: 9f50e3bc76 -s ours am: 3f4265aaf1 -s ours am: 65f5740cb1 -s ours am skip reason: Merged-In If2d442a524f007c46e864ae5256993ca7d39d905 with SHA-1 fe0576ad60 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/17544755 Change-Id: Icbf45dae5d58a8ce0c4fe3ccc5e0452cb6741c18 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: 95ffcc129a -s ours ↵Xin Li
am: 9f50e3bc76 -s ours am: 3f4265aaf1 -s ours am skip reason: Merged-In If2d442a524f007c46e864ae5256993ca7d39d905 with SHA-1 fe0576ad60 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/17544755 Change-Id: I56bf53a5e26a4b594cbd8b86eb6a234de7ab905a 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: 95ffcc129a -s ours ↵aml_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_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-art-releaseaml_tz4_332714010Xin Li
am: 9f50e3bc76 -s ours am: 3f4265aaf1 -s ours am skip reason: Merged-In If2d442a524f007c46e864ae5256993ca7d39d905 with SHA-1 fe0576ad60 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/17544755 Change-Id: I321fb099e3e298d0a6f11c3853198708e8d7a160 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: 95ffcc129a -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
am: 9f50e3bc76 -s ours am skip reason: Merged-In If2d442a524f007c46e864ae5256993ca7d39d905 with SHA-1 fe0576ad60 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/17544755 Change-Id: Ide521061b6ca7321c4c187e79daed6f7f011a14a 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: 95ffcc129a -s oursXin Li
am skip reason: Merged-In If2d442a524f007c46e864ae5256993ca7d39d905 with SHA-1 fe0576ad60 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/17544755 Change-Id: Ib95477fc36fa2991809791b42278c6838bc3ff6a 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: If2d442a524f007c46e864ae5256993ca7d39d905 Change-Id: Id6f94752d3b4c25c1cdf0e86d75482c3d7b0caac
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
a37d6867fe -s ours am: 9b8fe868ad -s ours am: fe0576ad60 -s ours am: 96203dc380 -s ours am: d0917d334c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2045910 Change-Id: Id9fd000e149baeeddb5cabf10ab78fcb2d90a185 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
7ffce4a1de -s ours am: ac23dfa1ab -s ours am: 16e1b5a7f4 -s ours am: 14859fb041 -s ours am: ae22a33b6f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2045910 Change-Id: Iff545decec65520bad895c67475de54197f2af47 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
a37d6867fe -s ours am: 9b8fe868ad -s ours am: fe0576ad60 -s ours am: 96203dc380 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2045910 Change-Id: I9a512b150a9be27913189621febd6a67d5f0502c 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
7ffce4a1de -s ours am: ac23dfa1ab -s ours am: 16e1b5a7f4 -s ours am: 14859fb041 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/BasicSmsReceiver/+/2045910 Change-Id: If9fed74ba7e0ff96b488a4f38d8379cd8dfddce9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 19:01:15 +0000