PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,996 Commits 1 Branch 0 Tags
d760dbf11d1705091d3b020d0c0d9dcfd0b51fbf
Commit Graph

126996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d760dbf11d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 177f3dbdaf -s ours am: 9bc2e74019 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfc2704a675bc261da0e910a382b6e58d85163cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:35:15 +00:00
Treehugger Robot
d72436e40a Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: ec9917069a am: c461c065f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I83a4ad173bcd2d915d54087548d29029ad6be36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:33 +00:00
Treehugger Robot
6f57d59f7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: cadb7815c6 -s ours am: 0e0826cf07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40a86f942d4f97b94362358d8390139202d30c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:24 +00:00
Treehugger Robot
5f58017c7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 1be1e662f1 -s ours am: ad626ab75b -s ours am: 1064cb569a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabf62405ede89f2bf35e193e28defd4f985f1cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:13 +00:00
Treehugger Robot
c937e75faf Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: b92621d8b4 am: a68274aaa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I7b9f518d823f792a1e30dd8dd9b68d12ad9e2604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:11:56 +00:00
Bill Yi
5635061844 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 5cdd88f054 -s ours am: ed55540bb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If721ef2b92df1364155530eed818573ee91164c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:11:49 +00:00
Yuxin Hu
4235638174 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: e58d73a958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I9741ceb39a659056384baebd1577c0ae142ef084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:06:31 +00:00
Treehugger Robot
2effabe658 Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: 0355076954 am: 21febf068d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I0d270ed604de78d4813489bf418e1182a14c37f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:02:21 +00:00
Treehugger Robot
b24d773173 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 am: b35a1eb5ca am: eb6317f2c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ieebfd2c7eb33cd57387680a131102b9e46cb5ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:54:53 +00:00
Bill Yi
5e480c92ab [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours am: 3752af781d -s ours am: 4183cb07f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib29947eec9ce2bdd16852040dde29253332a990d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:54:46 +00:00
Treehugger Robot
fc57d08ead Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b am: 9bd80164e2 am: 68b0a1a765 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ie585fdde2db0d01539e19f56ba5109257e46a1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:51:12 +00:00
Bill Yi
9bc2e74019 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 177f3dbdaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie86b695fb0694ce53b6af661537d7058082d9733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:27:48 +00:00
Treehugger Robot
c461c065f3 Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: ec9917069a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ib449a17bb19576f3a17256a175da43b09894eb3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:27:27 +00:00
Yuxin Hu
e58d73a958 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I0e42e030b582577d8becbd3b7b48068643cfd090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:27:17 +00:00
Treehugger Robot
0e0826cf07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: cadb7815c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffc3fbfb0cd96d6e34d8a8ece027d66c7409fe7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:09:35 +00:00
Treehugger Robot
1064cb569a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 1be1e662f1 -s ours am: ad626ab75b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c6e4a36a3d8ca1a5ea46df99e67a12ad02d30d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:05:49 +00:00
Treehugger Robot
a68274aaa3 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: b92621d8b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iad93ae871a69e9f9b047ed301e9ff11d03a18a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:50:09 +00:00
Bill Yi
ed55540bb3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 5cdd88f054 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2b32ba70705d85239fc4fb1ab590f8b7f0f3f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:49:59 +00:00
Yuxin Hu
6e3aba5366 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev 2023-05-11 20:48:57 +00:00
Treehugger Robot
21febf068d Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: 0355076954 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ie209127e717f6ce80e6748f5824bd4c1b9e56f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:48:42 +00:00
Treehugger Robot
eb6317f2c6 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 am: b35a1eb5ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I352007078a49c609314bb2dd0ef96f0636ca9d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:59 +00:00
Bill Yi
4183cb07f4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours am: 3752af781d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5dcbce2d2dd5f8681cc20536f25185fb8eae7903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:52 +00:00
Treehugger Robot
cadb7815c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6a96e0241ad9fd5f2856d1c885cacf7595b2890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:50 +00:00
Treehugger Robot
ad626ab75b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 1be1e662f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie375b8390560b3a2fe6cad6c30533b8d6915626d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:43:06 +00:00
Bill Yi
177f3dbdaf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7536b55258841a9425bafeaa714a6d3c6074e0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:43:05 +00:00
Treehugger Robot
ec9917069a Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I6c336bf3632b810a6f6768afa590d8ab85b613d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:42:46 +00:00
Treehugger Robot
68b0a1a765 Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b am: 9bd80164e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I306e19d3503d7c5af19ac7abb845e805c91f24da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:41:39 +00:00
Treehugger Robot
b92621d8b4 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iefe097182a38f5790a2d935fede1fb264e021d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:39:09 +00:00
Bill Yi
5cdd88f054 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I891b7994daa03dc2425c9e0b37578adabd372587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:39:04 +00:00
Treehugger Robot
0355076954 Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Iec18c50356c86d742e2c9731ba89e98911aefc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:38:35 +00:00
Treehugger Robot
d84734bcfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 755bff2524 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf40d48b42ee8a6fbe8cfcbff6a70dfe552302aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:38:28 +00:00
Treehugger Robot
ad5ee4e9b7 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 3dd5923ee6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ic53a5e1fe9714613b533a1926cdb7cba22563e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:17:40 +00:00
Bill Yi
af8b70b2bc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: fdb5379a3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c4d74d327462a3a16601ee45ed1b2506a216d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:17:34 +00:00
Treehugger Robot
297fd154a2 Merge "Fix string" into udc-dev am: 81ac516705 am: 6dd1415360 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ia5b0a4d82084445bc93f952358df36e98147235e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:17:15 +00:00
Treehugger Robot
b35a1eb5ca Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I58a383470f24e255d6532ec90373ead93f916fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:49 +00:00
Treehugger Robot
755bff2524 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f3db47edd99a6e7a05a5b3daccd9d7062b9ab4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:44 +00:00
Bill Yi
3752af781d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I309448f407730296c956ef3ff9bc45611f383307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:43 +00:00
Treehugger Robot
9bd80164e2 Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I722191069fb3273957f569354179ace9311e805f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:25 +00:00
Hao Dong
2f5564f960 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours am: f99b22505b -s ours am: 09362ab430 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: Ie2b16d9aad7513a1ea002eb09ce65bb4488684ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:22 +00:00
Treehugger Robot
3dd5923ee6 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I900808f14cb432a54401379725ac7f29cb9c344a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:02:31 +00:00
Bill Yi
fdb5379a3e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65abe33b0e180253fc49c79ab457aedb8f659c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:02:23 +00:00
Hao Dong
5e660a090d [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 4762df7e21 -s ours am: 4172ed9816 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I9eb0f8442214a531053c4ac1766a8ad41d997e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:01:34 +00:00
Treehugger Robot
ff50032a80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5851dbbfd91b13e24970394f62365881a41dba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:00:42 +00:00
Treehugger Robot
1be1e662f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44ccdf26e86e100cf552223c3f435876419df046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:00:15 +00:00
Treehugger Robot
58c8fae9db Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: If3c8f54780ccd351f3096d65e2e08c04ac2e575f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:00:14 +00:00
Bill Yi
40d95455c0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09e9852e5d5019401c4b9d17aa1b1ad7fff4eb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:00:06 +00:00
Hao Dong
8c175f0fd4 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 3d52ce0a95 am: 119012dd06 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I4d33492a89c16854dc3448a9b7d77fc30b332167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:59:29 +00:00
Treehugger Robot
0b57a35470 Merge "Fix string" into udc-dev am: 81ac516705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ia806f9235c495cd7d97953b5c07b2a66c454a358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:59:03 +00:00
Treehugger Robot
6dd1415360 Merge "Fix string" into udc-dev am: 81ac516705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I0920365fe3dd0e9ee7958ac82fbeb6f8359c6f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:58:53 +00:00
Treehugger Robot
e7d695f07a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8b6175859af028f1341d807fa08567b5dfae1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:56:48 +00:00