Commit Graph

112643 Commits

Author SHA1 Message Date
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
526736bec2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: ad88977bde -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: I3519f0f55b4920c5bcdad859e4a8519af4ef2a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:48:11 +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
1d7ecc10bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 306f06436c -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: I2f5b91ecb1c6f93c5d4abbf5999ae1998ccd9693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:47:58 +00:00
Bill Yi
b82aa42bc3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: a203f11bee -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: I984be9153b49484532e59b1e7b6cae80c1a4ee54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:47:44 +00:00
Automerger Merge Worker
a1c16a929d 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 am: f54d0819c5 -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: Ied33242155f84f6961101aab4c9fde36ff09d8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:44:07 +00:00
Bill Yi
2e04977c3f [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: 1c1c06e040 -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: I8dc6bca1f788e0cec0798e07b513952c249094e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:44:01 +00:00
TreeHugger Robot
14f55b4a33 Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev am: ce2405e922 am: de09f078db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19013797

Change-Id: I0f37fc578353727e6821bf4f3b370118c37c62fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:41:30 +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
26aa7ccdbd [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: d4db7fa1c1 -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: I4fad2e577ade67d619dca6bd1f7d9c3815ccd42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:39:01 +00:00
Bill Yi
07d7fb8ce0 [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: 57d4ba868a -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: I87bb896b2a20cbc77c8084d914151ad3ba80664c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:38:53 +00:00
Bill Yi
ba17fa587b [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: d13efd4008 -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: I1111048a59512f77cbca81874e26597499213656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:38:43 +00:00
Bill Yi
33d3dfe807 [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: 6c9ef0aae7 -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: Ifdd7a98ccb7d508db2fec1bb6477c61ac7e7c288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:25:09 +00:00
TreeHugger Robot
444ad773fd [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: Icdbca78a6e9d676627a522e59a56fe47bb2a46db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:24:50 +00:00
Bill Yi
ad88977bde [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: Ic4fee1c768eaeb16599907aa12bb01cc9e296e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:24:44 +00:00
TreeHugger Robot
306f06436c [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: Ibc58a8ff439e6971f523cff122295e5862a95e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:24:31 +00:00
Bill Yi
a203f11bee [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: Idc9414ef3b35e40d4622cb5968251ab200a59430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:24:16 +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
9d74f45488 [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: 0a1b86564d -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: I97bd06c37f7930c3e0d1c953b77c956e1f4575dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:20:55 +00:00
Bill Yi
ca934b0601 [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: 898b13d171 -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: I65f023fe7d0a36a2f3ee79338f430bc6e5315184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:20:53 +00:00
TreeHugger Robot
1a3b17f85b [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: 02a5cd38f9 -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: Id7a160d86dc2d7255cb9879d14cbda4f67943b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:20:51 +00:00
Bill Yi
53de3d79c8 [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: c073a3cd87 -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: Ibc9b9f270f69c30fd10b6c685cfbbeb2ba88f36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:20:44 +00:00
YK Hung
c22ea7dcc5 Merge "Add ykhung to the Settings Owners file" 2022-06-24 06:19:47 +00:00
Raphael Kim
c5bb319bba [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: 4378e68156 -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: Ib5aebedbb90f3bba94d948bb11acd8e50a84bf3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:16:49 +00:00
TreeHugger Robot
37b5baf6d5 [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: 52fb582fe2 -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: I1db9f4ccd4d93cf72f7c0e62859298ba57a5bce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:15:27 +00:00
Bill Yi
540b60d6bd [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: f5709fa25a -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: Ia654a4a968c16797e412bedc039769c54daabbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:15:24 +00:00
TreeHugger Robot
4bc33da1eb [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: 0797a8cee8 -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: Ia1c9ad9f202d99486c4adb971ab340b8a4fcd44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:15:22 +00:00
Bill Yi
ba22ab372b [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: eef5b33a7f -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: I997e0d0229259dbf81e6d59c419dfa23bece49fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:15:12 +00:00
Automerger Merge Worker
4e37c664a5 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: ec1f9d56e6 -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: I33e2a419ef32eadf6a32e3cfefb34699019f2cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:05:39 +00:00
Raphael Kim
a3fc0f102f [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: 3a80a79fd1 -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: I735416ea3773a4e54fe768f3286b77df93bc7e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 06:05:37 +00:00
Edgar Wang
d9ffdf7c6e Add ykhung to the Settings Owners file
Change-Id: I6fba7c7b4663407d4852808702205f7300dae81c
2022-06-24 05:58:57 +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
Arc Wang
995433a9db [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: 419641bd64 -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: I5b2157202369625115715244df6bea39b0c59da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 05:49:55 +00:00
Tsung-Mao Fang
04d5add97d [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: ef96bfb712 -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: I2fe47b010d4d21586983eeaf41c74cddd0be1035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 05:49:53 +00:00
Arc Wang
cabf2c2683 [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours am: 4129c273cc -s ours am: e6135eeb89 -s ours am: eb1d86b66b -s ours am: 9f25b6ebb2 -s ours am: 0526a4df0b -s ours am: 9a6a062ec1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id704456d9eec3efab4f848885e0d8f1ad6fa1fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 05:49:52 +00:00
Arc Wang
f242214e67 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: e7ecf11a38 -s ours am: f026e9b800 -s ours am: d9190b2809 -s ours am: 6cf822d742 -s ours am: 52e74f7d03 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

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

Change-Id: Ifd311f2e1348144c570a44b22f47fe1127e724f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 05:49:34 +00:00
Tsung-Mao Fang
33932b392f [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ab42aa1a96 -s ours am: 6d3f4e10cc -s ours am: 41d96347fb -s ours am: 20670bcbbc -s ours am: bba0d0eef4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iecb7b1d1f60981ba906421d3e691b2176b0f7c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 05:49:33 +00:00
Arc Wang
287a5f7291 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 8d2a48f22f -s ours am: 08df31aab0 -s ours am: 4b4bc70165 -s ours am: c37277b18a -s ours am: 23d6fb17ea -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

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

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