PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,823 Commits 1 Branch 0 Tags
7081c9eeb10f3f87f0fa14dfcd045b55b7eab67c
Commit Graph

121823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
bb32da49da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1fb52a55aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia21ccbf01d4a062bf567ae3df26c12ea74f6a013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:31:24 +00:00
Bill Yi
3ff93c7748 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c24e1864d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b8595048a2cfb19d120bad0d7f1e009ce5ee9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:30:34 +00:00
TreeHugger Robot
f4c558c9cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d91a57792 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3156715be7dc47c0f6801066949f1becf6d50ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:24:54 +00:00
TreeHugger Robot
e3c5fef308 Merge changes from topic "tc_change_23031509_19" into udc-dev am: 8cb7a890c7 am: 7321675c49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583

Change-Id: I753fa3827b0b1ba53c66f4db544a7bbb9d25780c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:22:38 +00:00
Bill Yi
3e1b3759a4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b am: aef5e4d513 -s ours am: df1118f378 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebb9b2e9b9ec48e8c348bb96fa1e022ac231b4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:22:25 +00:00
TreeHugger Robot
f8edeb14fd Merge changes from topic "tc_change_23031509_19" into udc-dev am: 8cb7a890c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583

Change-Id: I71b1f61b3a68b6ba83fc8886ab84845e7879de89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:12:32 +00:00
TreeHugger Robot
7321675c49 Merge changes from topic "tc_change_23031509_19" into udc-dev am: 8cb7a890c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583

Change-Id: I929c22b32c70358031c8f28b19f350c883b689d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:12:24 +00:00
Bill Yi
11c5f98ade [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b am: aef5e4d513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2dbb9c7adc27b85f746657e7ab498339fc158859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:12:24 +00:00
Bill Yi
df1118f378 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b am: aef5e4d513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90ce65819f43e8d21d7c4bfd816eae5674ac39cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:12:14 +00:00
TreeHugger Robot
1fb52a55aa Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-16 01:02:53 +00:00
TreeHugger Robot
8d91a57792 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-03-16 00:51:39 +00:00
TreeHugger Robot
8cb7a890c7 Merge changes from topic "tc_change_23031509_19" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-16 00:51:39 +00:00
Dmitry Dementyev
addca2d7f9 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c am: 84e533536d am: ed19f07538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I6891d0958303f49ea78967e41eb3781a32f26ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:46:35 +00:00
Diya Bera
d0a4575562 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1 am: 1e6508ef77 am: 7df7e5cab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: Ic466a387e99aadc4061aaa508d5b3ff4541da594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:45:23 +00:00
Dmitry Dementyev
1126f94021 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c am: 84e533536d am: e2b729ba1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I30b1027e13e041bf7f9e7e7cef38f29bcdf73282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:44:40 +00:00
Diya Bera
6ae1b17960 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1 am: 1e6508ef77 am: 9c4169caa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: Ie068ef80011b5b9095c5a627290febc516d8303e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:43:46 +00:00
Dmitry Dementyev
e2b729ba1a Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c am: 84e533536d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I318e56246ccbccfbe5aaec328ec8fe04940bc523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:11:07 +00:00
Dmitry Dementyev
ed19f07538 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c am: 84e533536d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I0377f99b4ed639dddbbbb6c9b88ecce3512f306e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:10:55 +00:00
Diya Bera
9c4169caa1 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1 am: 1e6508ef77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: Ie1d4848123ad94c496b1868d80fb2851c7c0a5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:10:37 +00:00
Diya Bera
7df7e5cab9 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1 am: 1e6508ef77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: Ic26a5890b1c623e80cb1fad180ef010f5d464953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 00:10:12 +00:00
Dmitry Dementyev
84e533536d Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I4a906b5a00c86fbe93141acda9db00cc190ce7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:31:06 +00:00
Diya Bera
1e6508ef77 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: I15927b82d701b37054746103c42ced0f3f7ab9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:30:45 +00:00
Dmitry Dementyev
ef3045caaf Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d am: c264e26eb2 am: 5e88a1c13e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: If460bef044a46e744c960e982f11312dfe7900a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:23:58 +00:00
TreeHugger Robot
e8aed341d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours am: 49c4abbf69 -s ours am: e0556abef1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibba20e57e0d2a2f34917c7cf1374db9b56ec76ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:18:18 +00:00
Bill Yi
f42793d83f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours am: 3fe085e762 -s ours am: fadbd56e46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I787e8782b934d6669a396e07268ad9c0f59fde30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:18:07 +00:00
TreeHugger Robot
30d9c93b79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -s ours am: 29827c0b25 -s ours am: 695531169d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb80a9e2725616adc6493ad19b3896dd17f3f8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:17:52 +00:00
Bill Yi
b5ef9f60cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -s ours am: 9db3fa17e0 -s ours am: eaa0f14003 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1652e549616ccea10efc67d355719840331ddf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:17:39 +00:00
Dmitry Dementyev
118dbc4e47 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d am: c264e26eb2 am: ccfdc32542 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: Iddb91c4d9f6e17701c645c5c47af8d34cbb6f717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:15:31 +00:00
Dmitry Dementyev
ccfdc32542 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d am: c264e26eb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I5d32642eb5e57f654015a7008045827cd4803ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:14:09 +00:00
Dmitry Dementyev
5e88a1c13e Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d am: c264e26eb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I9094cbc9dbcf8b190a61dbcfaffa6ff8dab97869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:14:03 +00:00
Michael Groover
3019ec6c43 [automerger skipped] [RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest am: 5b5da43ef8 am: b746d0a6c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf5bf67803d7421e13d430ad9806d2867be904aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:12:55 +00:00
Dmitry Dementyev
c03f2fe49c Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: Ib6464d437f7b2ead5cd9b00f13431149979ff8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:11:46 +00:00
TreeHugger Robot
9e2d367c7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours am: 49c4abbf69 -s ours am: 6c40ca859e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia08ad516319e822cc75a37d1f63cd05e2d6eddbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:03:04 +00:00
Bill Yi
bdb80bff8e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours am: 3fe085e762 -s ours am: 46d66084bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f4d2f208b8ad66cafcda3df0ca6f91768baad3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:02:55 +00:00
TreeHugger Robot
f73fd91ce6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -s ours am: 29827c0b25 -s ours am: ef288d9201 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68fa3d74c0142c4692803f43fb1fbd9eddc0fa15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:02:40 +00:00
Bill Yi
d147fe6e5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -s ours am: 9db3fa17e0 -s ours am: 5b69ffcefe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44bb8e6efbc3d802806b21672cecea97020a1681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:02:28 +00:00
Michael Groover
cbe099936b [automerger skipped] [RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest am: 5b5da43ef8 am: e2e59e35ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9006db818ff45158278789e0e15b40d1c84a586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:55:49 +00:00
Dmitry Dementyev
92babcaef5 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: Id32c9274ed8290b709328924d698dbdf130b8d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:55:00 +00:00
Dmitry Dementyev
c264e26eb2 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I78c604d15fbb47533e9b302a501c71f5e38a9f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:52:45 +00:00
Diya Bera
ed1bb20ff1 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: I190752b9c2a65024c140b7dab92524097c183ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:52:07 +00:00
TreeHugger Robot
e0556abef1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours am: 49c4abbf69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8240006db442e814bd7bda8c294cb6ef9fc6da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:48 +00:00
Bill Yi
fadbd56e46 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours am: 3fe085e762 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44fdc6a9195edb3d7b43c979e3d13f3e416e6021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:42 +00:00
TreeHugger Robot
695531169d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -s ours am: 29827c0b25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5a6262936dc0c11ed6d8ebf787967af2d9a1f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:27 +00:00
Bill Yi
eaa0f14003 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -s ours am: 9db3fa17e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a34c2a6d107c606aece9baef384ef24a291435f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:06 +00:00
Lifu Tang
caa1b51ef2 Revert "Remove duplicate strings." 
Revert submission 19748582-settings_yesno

Reason for revert: Common strings in English could be translated into different strings in other languages.

Reverted changes: /q/submissionid:19748582-settings_yesno

Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
 2023-03-15 22:39:24 +00:00
TreeHugger Robot
6c40ca859e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours am: 49c4abbf69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6695c490dd407d36530776bf85e1587ac42832b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:39:23 +00:00
Bill Yi
46d66084bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours am: 3fe085e762 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa3569b1b563a7a74e535c67784c26bc3211b9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:39:12 +00:00
TreeHugger Robot
ef288d9201 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -s ours am: 29827c0b25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82ea0aa63538ab504eb8cfe1f22ea28fb037ebc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:38:55 +00:00
Bill Yi
5b69ffcefe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -s ours am: 9db3fa17e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc4c848fad67261cab3f6e86d4661d015644d8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:38:41 +00:00
Michael Groover
b746d0a6c5 [RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest am: 5b5da43ef8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22102862

Change-Id: I96e8a6ce9289063546d9a3e093f9b27aa537b77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:35:05 +00:00