Anvesh Renikindi
|
511fc77c6e
|
[automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours am: 52f50db889 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442919
Change-Id: Ie1aedddd1da0a5121b16c36bb90c0141759f7348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:59:11 +00:00 |
|
Anvesh Renikindi
|
2e53abf492
|
[automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours am: 445d0468a7 -s ours am: 91c11a510e -s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: Ie7058f3bcebe01788252b20595384e1193c29e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:59:06 +00:00 |
|
Jiaming Liu
|
f97ce8ce5e
|
[automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -s ours am: e220a48650 -s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I3c36e6fe17f22cc7ca7474a4d7931f3f13c536ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 00:58:56 +00:00 |
|
William Escande
|
dfe474b23c
|
[automerger skipped] Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817 am: 1d6757782c -s ours
am skip reason: Merged-In Ie6a6b27247896e2a9a410197135e44a22ab1428c with SHA-1 c0a7e8f8f0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I7c450179fe4b7403bf7486d7a13b7f10cf70d629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 23:54:08 +00:00 |
|
Anvesh Renikindi
|
52f50db889
|
[automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours am: bdd54472a8 -s ours am: 410fa6cfc5 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442919
Change-Id: I7020d2db7917247f08344ccdee09b5799931f0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 23:33:36 +00:00 |
|
Anvesh Renikindi
|
91c11a510e
|
[automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours am: fc43a1156c -s ours am: 445d0468a7 -s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I4eff1cd9accd1cf73f5835d2b31ce7bf4a34958c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 23:33:33 +00:00 |
|
Jiaming Liu
|
e220a48650
|
[automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours am: 8b4f036a3f -s ours am: be5caf1230 -s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I13481950639eef78839601e8171484036437fed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 23:33:30 +00:00 |
|
TreeHugger Robot
|
5443c95ea8
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d7b8a73da9 -s ours am: 26a297b550 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531856
Change-Id: Ie40a7acf1146be34444deb35748113c5452020c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 23:00:05 +00:00 |
|
Bill Yi
|
6f3693d918
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48957d9e2b -s ours am: fc6f490526 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531856
Change-Id: I0d60cadfedcd8adb650dd05b3180edfac58ec67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:59:58 +00:00 |
|
TreeHugger Robot
|
b6a7400f6d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d1dbd3e1e -s ours am: bcba6207f1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531846
Change-Id: If2fa5a285a65e2f456102b5c958249a3b3a10de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:59:52 +00:00 |
|
Bill Yi
|
a3b4554682
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1051b47c26 -s ours am: 6bb86d9a10 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531846
Change-Id: I3536f5d9c56f37bcf6a57249661d1ae5b5d59aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:59:32 +00:00 |
|
TreeHugger Robot
|
affadf9e9b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2593eaea99 -s ours am: 9a3c028594 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: I06248844e1333ce70606966aa34f576479838eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:59:20 +00:00 |
|
Bill Yi
|
a165e66eb7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f -s ours am: eb1157c0d2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: I14a661b55940cb1c8f4429844eb788a6c489d578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:59:16 +00:00 |
|
William Escande
|
1d6757782c
|
Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: Ia76738046150ec93c055479541944df25fa8673c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:53:11 +00:00 |
|
TreeHugger Robot
|
0a0640ec02
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours am: 24c843fb30 -s ours am: 3648275e0e -s ours am: a8e2e5d101 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I7181ab2d8755321155588e68f93699aded99d05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:56 +00:00 |
|
Bill Yi
|
99d795343c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours am: 07b4ad75b4 -s ours am: 69803e4b8f -s ours am: 341f7a1185 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I0da93fe998bd045c1f075d7a196fade36401a6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:53 +00:00 |
|
TreeHugger Robot
|
a26f034312
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours am: 95d0cc1766 -s ours am: 6ac3ac9e63 -s ours am: 14389d1638 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: Ib123de5e001dd71af61e33d4d4a6087d95b2c246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:50 +00:00 |
|
Bill Yi
|
e879b9efc7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours am: 881db50b16 -s ours am: 88743c60d1 -s ours am: cddf29a7dc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I4d042c297a5ab3d12357ff67f2be04fdcc8c45e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:51:00 +00:00 |
|
TreeHugger Robot
|
57e7405202
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours am: cb5e97de8a -s ours am: e32f2d2b85 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I657d495a13638fe8c42626b1c3f89639533c67e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:28:05 +00:00 |
|
Brian Lee
|
e2c73af337
|
Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3 am: e07b26752f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915
Change-Id: I2910ffccc0b536ee9ff1bef2b9d6a3c64b09f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:52 +00:00 |
|
TreeHugger Robot
|
f33564a49a
|
Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475 am: 7d260c1654
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I24c4753ccfd0e6f9c0d499c90008be3524a4a03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:07 +00:00 |
|
Bill Yi
|
ce46a7afcb
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652 am: 5bdc27be54 -s ours am: 0d1cc8a7f0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I4fef0e9bc0a633711724688353095b108c155a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:27:04 +00:00 |
|
Henri Chataing
|
d0c9430840
|
[automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours am: 2b70be5485 -s ours
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: Ibf3adbb12f445c63e71690459b19c249fbd33453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:50 +00:00 |
|
Jack Yu
|
83bf646000
|
[automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours am: 8b0fa20c98 -s ours am: 7f070778cb -s ours
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: I8505f379ca9517a9132bef3d0724847ca2830d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:47 +00:00 |
|
Jack Yu
|
7f2acfb735
|
[automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours am: 3c0d7c9bfb -s ours am: 6aa379657d -s ours
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: I4d0279279fcebce29a75cdb509911e7dfc8146dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:45 +00:00 |
|
Jack Yu
|
6f2a3f7508
|
[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours am: bac3cfcbfe -s ours am: 0800590570 -s ours
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: I71da2527a732bb5197d1938438987fdd1b973367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:22:25 +00:00 |
|
Automerger Merge Worker
|
ad3f96436c
|
Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev am: 3e158cd48b am: 1b93660219
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642
Change-Id: Ic33944b232ccb2bccb3b4d05744dbebc06813478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 22:13:44 +00:00 |
|
TreeHugger Robot
|
7cef104bab
|
Merge changes from topic "tc_change_23022120_23" into udc-dev am: 1e410e7a11 am: 34a75bf63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269
Change-Id: I762dddfb6584c2c783949e0b5219274b274064c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:52:02 +00:00 |
|
Bill Yi
|
0d2ba5c0f1
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e21149b10a am: 2f3719e7f8 -s ours am: 2ab0d2d710 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269
Change-Id: Idce13dde5ef0c7932237b42319239476d0eb6da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:51:53 +00:00 |
|
TreeHugger Robot
|
26a297b550
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d7b8a73da9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531856
Change-Id: I44e7027d1f79c77cd223b77facf5e2fa1f363021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:34:35 +00:00 |
|
Bill Yi
|
fc6f490526
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48957d9e2b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531856
Change-Id: I4cbbb8c50c4c6304db2778e666e5c827efdce5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:34:32 +00:00 |
|
TreeHugger Robot
|
bcba6207f1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d1dbd3e1e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531846
Change-Id: Ib474ba7658438e6aa73bce78ad86bbfb7c03fde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:34:29 +00:00 |
|
Bill Yi
|
6bb86d9a10
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1051b47c26 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531846
Change-Id: Ie721bc450b56f1b6cd8260a4640cbde2a5ac02e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:34:26 +00:00 |
|
TreeHugger Robot
|
9a3c028594
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2593eaea99 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: If320f4d7bec05195a695c3c862da656f756df935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:34:23 +00:00 |
|
Bill Yi
|
eb1157c0d2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531845
Change-Id: Idd9697c51844e65517ebf743b126dd0a4cd26234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:33:18 +00:00 |
|
TreeHugger Robot
|
4f884ca030
|
Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693
Change-Id: Id2f1480e4996f8c4e1856cede8a3adf3907a88bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:13:58 +00:00 |
|
TreeHugger Robot
|
a8e2e5d101
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours am: 24c843fb30 -s ours am: 3648275e0e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I6b47b85bcc95c48fa55a87447367de1a31e30440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:05:25 +00:00 |
|
Bill Yi
|
341f7a1185
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours am: 07b4ad75b4 -s ours am: 69803e4b8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274
Change-Id: I76910cf8e6a6d55de4878241c5f77eaf1833a956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:05:15 +00:00 |
|
TreeHugger Robot
|
14389d1638
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours am: 95d0cc1766 -s ours am: 6ac3ac9e63 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I2b65ec02b17b221fbe4bbf5220bddf6f451df853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:05:08 +00:00 |
|
Bill Yi
|
cddf29a7dc
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours am: 881db50b16 -s ours am: 88743c60d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272
Change-Id: I79d2effee11c8b9c514a6875dfb02133780830de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 21:04:38 +00:00 |
|
TreeHugger Robot
|
e32f2d2b85
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours am: cb5e97de8a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I6ae1a5d5238c34bfeaf30875122d41eaebb34398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:51:02 +00:00 |
|
Brian Lee
|
e07b26752f
|
Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915
Change-Id: Id15ac19f3c27641f06b0f92bf572350d58adab21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:50:48 +00:00 |
|
TreeHugger Robot
|
7d260c1654
|
Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I8864a3d4ea5426644b4e61ac2e74c303e4a1e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:50:26 +00:00 |
|
Bill Yi
|
0d1cc8a7f0
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652 am: 5bdc27be54 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268
Change-Id: I305c177e616a687460f04e559187b7e3055e4a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:49:49 +00:00 |
|
Henri Chataing
|
2b70be5485
|
[automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: Idbdfd1f019919eecd92149aeecc29d1c7283f90a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:33:25 +00:00 |
|
Jack Yu
|
7f070778cb
|
[automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours am: 8b0fa20c98 -s ours
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: If060020d1bb33c11421b50a4ff1bdc7c008591e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:33:23 +00:00 |
|
Jack Yu
|
6aa379657d
|
[automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours am: 3c0d7c9bfb -s ours
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: I4efffbe58669c8546ba5ba316f8fc76455500606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:33:20 +00:00 |
|
Jack Yu
|
0800590570
|
[automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours am: bac3cfcbfe -s ours
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: I06d2a597c142727de07804b53e5dbb75f3881ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:32:31 +00:00 |
|
TreeHugger Robot
|
6d3a9b40d4
|
Merge "Clarify string for translation" into udc-dev
|
2023-02-23 20:28:58 +00:00 |
|
Automerger Merge Worker
|
1b93660219
|
Merge "Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2" into udc-dev am: 3e158cd48b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642
Change-Id: I4e3aa37e75fde2c35794f3c1cf498300499d1522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-23 20:13:25 +00:00 |
|