Commit Graph

107807 Commits

Author SHA1 Message Date
TreeHugger Robot
2ff94793bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: 3c670f625b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I4b1842f878fd130e8ff90c6a7bbc04fd24df65f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:49 +00:00
TreeHugger Robot
fb2bd662ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: 3c670f625b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I3d8f62997fef6fe12ef4cad3d12b19833841d2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:43 +00:00
Bill Yi
49301ea290 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 1b6e655273 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I4136f7fe22f86c0523b41e2a20d8316c6fcd36ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:40 +00:00
Bill Yi
5d82388879 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 1b6e655273 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: Ib4b16e3515455fb7a05131d434e325761c73fc7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:31 +00:00
TreeHugger Robot
a401e8ac3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 70e38435d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I94970b9d7f965e9dd88c42921183f04c398b681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:26 +00:00
TreeHugger Robot
0e80df376a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 70e38435d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: Ia688688440b1b465e21341fbf6c4ba177ea4f507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:18 +00:00
Bill Yi
5a73a597b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: e780500266 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I1d28ff3747a3c8d0f6cfad3991d3362b4a73ff12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:15 +00:00
Bill Yi
d72a7b2e10 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: e780500266 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: Ieb35d1f0647dc761802e593215c162f026a61e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:08 +00:00
TreeHugger Robot
78bbedd0ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: d1ff298845 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I1c6169b09d62f57589cda5da59a31a5f71a30194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:40:31 +00:00
Bill Yi
2639731d35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 0a28003111 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: Icea8ade2cdfad82ccdc6d179116988053ea025bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:40:22 +00:00
TreeHugger Robot
bf69f2e66c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 83d410a6de -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I4d358fd691d090300c9d60261590cc9e600dd374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:40:07 +00:00
Bill Yi
54a69e25e9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: 9dbc2805b8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I7d97f5bb4c60308466355d8e21932616bb9e3c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:39:58 +00:00
TreeHugger Robot
3c670f625b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I47acf265f965f1c11d120fda0dfc7e6722d92996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:23:40 +00:00
Bill Yi
1b6e655273 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I1d799cd34b481248a08d8370ef17487ec6869336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:23:30 +00:00
TreeHugger Robot
70e38435d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I052397307c2e612c044e56f4635ec91df71fead9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:23:15 +00:00
Bill Yi
e780500266 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: Id695b1fd9d940d8682fb7b7835270dac9fd2ca54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:23:03 +00:00
TreeHugger Robot
d1ff298845 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: Ifd86338286a9313c5d77828b7fca55b691efaa6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:22:19 +00:00
Bill Yi
0a28003111 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I6da453aa496c2e74225e98dcde6f404ce1feebf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:22:14 +00:00
TreeHugger Robot
83d410a6de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: Ifd27b45e884d7e587665b70f22f126b290a91930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:21:59 +00:00
Bill Yi
9dbc2805b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I68f3e1282310354db78f5327cc71603fea5c32e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:21:45 +00:00
TreeHugger Robot
91d1b5cc61 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:42 +00:00
TreeHugger Robot
8b49ce00c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:42 +00:00
Evan Chen
fc86787927 Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev am: bd2b5e7bfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18744660

Change-Id: I45cdf05096add05a6702a703fc9287f0237bb8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 04:52:37 +00:00
Evan Chen
bd2b5e7bfb Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev 2022-06-24 04:25:49 +00:00
Bill Yi
5ab22a539f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: 4bdcf48ffe -s ours am: b2da2beab0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983537

Change-Id: Ie269f3f88a3716e73db27f1aea1639f8c6e69852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:22:21 +00:00
TreeHugger Robot
f45487db4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours am: 92bc197d7d -s ours am: df4c6650f1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819

Change-Id: Ia7f09dc3176579af57b62ff221bbfdf4bfe4e2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:19:38 +00:00
Bill Yi
2955856271 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours am: 45e908da1a -s ours am: 7c933ae10f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819

Change-Id: I730bf55aff05b1b390bb8d4ed005ac4cddc7d0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:19:34 +00:00
Bill Yi
2833d51be5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours am: 61bc8e9096 -s ours am: 0e1b357011 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856818

Change-Id: I20ad2fbcefbbc873917fe31ab2504f6832aa75af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:19:17 +00:00
Bill Yi
ba1e6914ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours am: a12b67f6ed -s ours am: c5c3355e5c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774214

Change-Id: I5fbf64957698eceae23d4c43c5800ff3dcf54a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 03:03:25 +00:00
Automerger Merge Worker
f54d0819c5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: ee5792817a -s ours" into tm-qpr-dev-plus-aosp 2022-06-24 03:02:08 +00:00
TreeHugger Robot
de09f078db Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev am: ce2405e922
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19013797

Change-Id: I07be1bdf7db2ce3d619006a0be4bbd7bd1c8827f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:58:42 +00:00
Bill Yi
1c1c06e040 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: ee5792817a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983537

Change-Id: I0437dc5065bc49805e2c2bac0b956924fee8f8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:58:38 +00:00
TreeHugger Robot
d4db7fa1c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours am: 886b1ed6c2 -s ours am: b6c6baf9c0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819

Change-Id: I940b98c8d2675e44de657650e0a7f319220bf071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:55:32 +00:00
Bill Yi
57d4ba868a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours am: 914aa7d423 -s ours am: b9e6b6b5f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819

Change-Id: I9f1e2bca4267f35bf7709c61f9cd274d0a36a8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:55:25 +00:00
Bill Yi
d13efd4008 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours am: 29bb5a7941 -s ours am: 2421b38193 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856818

Change-Id: Ie76cd9b326deec7ac0902dbae5accfb9ad0b85b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:55:12 +00:00
Bill Yi
6c9ef0aae7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours am: 7ef26b068f -s ours am: f5971dd419 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774214

Change-Id: I6f0c3789d04483d3135d6a7a390b1c30c1a00103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:47:40 +00:00
TreeHugger Robot
0a1b86564d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours am: 975270c942 -s ours am: 757dd97c16 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364

Change-Id: I28781d8e73217728146628909f7143f5efa0c7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:45:13 +00:00
Bill Yi
898b13d171 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours am: 9eba6b6755 -s ours am: 405c452c8e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364

Change-Id: I3ad81cb0b88d58a783c6dd9572a64a33fc17f061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:45:03 +00:00
TreeHugger Robot
02a5cd38f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours am: 3116a23082 -s ours am: 26653b5de6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361

Change-Id: Ib03b4098560c8e76fc84122b580bb9b21b020eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:45:00 +00:00
Bill Yi
c073a3cd87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours am: 1a6e2f7f6f -s ours am: 67cc740687 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361

Change-Id: I11e6d2adbf4c3651e68c4596d0b415f5ec1a97b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:44:53 +00:00
Raphael Kim
4378e68156 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: fbfa9e2df7 -s ours am: cf3fe49391 -s ours am: f338527c54 -s ours am: 70eb44d745 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ic4c2c2547eb1007c8d290f412be36709227c80ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:39:15 +00:00
TreeHugger Robot
ce2405e922 Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev 2022-06-24 02:38:54 +00:00
TreeHugger Robot
52fb582fe2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours am: efd715f248 -s ours am: fe14c2c5ca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364

Change-Id: I206aaa5d63e5031aea2ceab018c82e193ae4c80d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:42 +00:00
Bill Yi
f5709fa25a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours am: 92aba93e39 -s ours am: e60add9114 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364

Change-Id: Iaf9a5cffa82623a5fb2ebd7a871001fe3be6f965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:34 +00:00
TreeHugger Robot
0797a8cee8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours am: f8e852db28 -s ours am: 394e442977 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361

Change-Id: I2dc73d8c2196f96ae3e05a5905d7fdb5df373896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:32 +00:00
Bill Yi
eef5b33a7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours am: 76894ab4b7 -s ours am: ea6584d71b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361

Change-Id: I83c01fc293793a819400540616010e1f63f8d904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:38:26 +00:00
Automerger Merge Worker
ec1f9d56e6 Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: fbfa9e2df7 -s ours am: cf3fe49391 -s ours am: da80f7abf8 -s ours" into tm-d1-dev-plus-aosp am: 01264114a2 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I336e76268aee97f39557412466bd700ba5d7fcd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:27:23 +00:00
Raphael Kim
3a80a79fd1 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: fbfa9e2df7 -s ours am: cf3fe49391 -s ours am: da80f7abf8 -s ours am: 3f1215df6a -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ieed1344c1c95edb1ba8c3ebdfe442c3de1f557ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:27:20 +00:00
Arc Wang
419641bd64 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours am: a58d975aa0 -s ours am: 5f46cdb737 -s ours am: fcbf0ac60b -s ours am: b20064ac60 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: Ic320abaf34a9201cdcbf533a62483cc88e469f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:24:04 +00:00
Tsung-Mao Fang
ef96bfb712 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours am: ecde630b9f -s ours am: 0572826178 -s ours am: 24ecd6a649 -s ours am: d129fe931a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: Ib44b91d381856fbea4ccb5a7592755c76fdc3abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 02:24:02 +00:00