PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,097 Commits 1 Branch 0 Tags
e5a38588ad511744f078d810dba6d8d26487cd7c
Commit Graph

111097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
73f88b030d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8c6cb5b92f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15edf621f98a17c97ac2fb768f0cc3688c3201d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-29 08:04:20 +00:00
Bill Yi
75bae152ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 691a40febf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54f347c23b77f0593abee58fd7e9088fef4120e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-29 08:04:13 +00:00
TreeHugger Robot
1a4a54b8ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2d8d8604cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dc65364fda85164bdc5061094c40d49e9356457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-29 08:04:11 +00:00
TreeHugger Robot
8c6cb5b92f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-29 07:46:43 +00:00
TreeHugger Robot
965e40b36b Merge changes from topic "tc_change_22052623_3" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a57110676f
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-29 07:46:43 +00:00
TreeHugger Robot
2d8d8604cf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-29 07:46:43 +00:00
Anna Bauza
935b735fb4 Fix "Turn on phone calls" for guest user 
Move "Turn on phone calls" from guest detail user screen to user screen.
Optimisation: Applying restrictions to default guest user has been moved
to UserManagerService -> setDefaultGuestRestrictions.

Following UX there is no need for confirmation dialog.

Bug: 191483069
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER="com.android.settings.users.GuestTelephonyPreferenceControllerTest"
       make RunSettingsRoboTests -j128 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: Id7391d3f85954ea7f9c94791f24174105ec8073e
 2022-05-28 07:18:40 +00:00
Ilya Matyukhin
28608774cb Update biometrics OWNERS 
Bug: 234195983
Test: N/A
Change-Id: I9843d0d6fad638cd14296624b11f86a273baab1c
 2022-05-28 05:36:43 +00:00
Ronish Kalia
46ccb94e38 Merge "Fix the intent<->activity mapping for wallpaper intent" 2022-05-27 23:54:24 +00:00
Automerger Merge Worker
5848c3dcbc Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp am: fd82bd854e am: be7287840a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527

Change-Id: I5256b86dbc838435d55e363c2042d32c30b70f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:21:08 +00:00
TreeHugger Robot
76ae26b37d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours am: 8961fbeada -s ours am: 4f77fe31cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ae9f62fe9d43a33229ea1661143480c2ac80fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:20:50 +00:00
TreeHugger Robot
6e261ece16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 0a6b06ad2c -s ours am: 60ed9dbd53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7003711f83063bff5646883e77e47ceceec96f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:15:28 +00:00
Bill Yi
d908079439 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: 6352a444cd -s ours am: 3f1595dfb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66cb046aad197adb842d959589784d13762ca79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:15:21 +00:00
TreeHugger Robot
bc9d6b63ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: d221387e32 -s ours am: d6db69358c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I491f6c904060b782a52f7bbbca124b81225b6ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:15:05 +00:00
Bill Yi
8ca501b8ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: 5c1d9fb325 -s ours am: 944416da76 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib88efb5aea694703e7ea7e95b251d3c6370f759b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:14:46 +00:00
TreeHugger Robot
16b39ec301 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 9a9de52dbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id544655c518f256a061d11879055d49dbc57c72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:01:40 +00:00
Bill Yi
f99bdfbc71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: a21e6047d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2a666c7b9eb0e91eaf25c5dce7c93751ea7b511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:01:34 +00:00
TreeHugger Robot
18bc2bfa2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 97da3dde63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1286bbc1090aae889e220a7e410ae6eac730ba26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:01:19 +00:00
Bill Yi
38756d1052 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: 0a567537cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a6fa7632447531bee4cfe452c2daa81c756f793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:00:58 +00:00
TreeHugger Robot
f97fad6296 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 7b75a759ac -s ours am: ab134299ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4fbac704db46925c685d3cd422655aac133d036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:56 +00:00
Bill Yi
ac548e4e03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: f3ba7e3f06 -s ours am: f16931bcd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d630af0fa6e19ead0d6b89299e40cf7aa023f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:44 +00:00
TreeHugger Robot
cf66ace091 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: 2ba92e1138 -s ours am: 4f5208759c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id978500bf1d888eb07db7a78ae7cd32b23ac8a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:28 +00:00
Bill Yi
fa3de1919b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: fcf0332625 -s ours am: c5c54308a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d9531f68e68a14ff68b344d9696629ac0a0ead0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:14 +00:00
TreeHugger Robot
9add0d2a5d Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: ca0b0e7ca2 am: 6510f92f81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Idb59be3179d3c1b692239e268e8670140c3cf48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:30 +00:00
TreeHugger Robot
23eda46eda Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: 232db4bfb1 am: 673a36aa13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I538e826152d4f55cbdb4f19bb7b4ce4ab3c8a574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:23 +00:00
TreeHugger Robot
8467488451 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 am: a00962e0c7 am: 3ab05042dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Icfe369e57766961ce3e4d1c4734dd25cd07548af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:15 +00:00
SongFerng Wang
5d274e0ad3 [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours am: 81d910a3bd -s ours am: edddac92a4 -s ours am: 0752f380cd -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: Id523d38dbff2acdbd560b9aafa81261a84caa691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:06 +00:00
SongFerngWang
ee00273780 [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours am: 0cdfaf2eed -s ours am: 033d0d96a0 -s ours am: 5e65f07c0e -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

Change-Id: Ie5c3cae2e4d017224fce5f66b74ed522e8e838fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:05 +00:00
SongFerng Wang
b6e8feaa9b Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: b5bc3952c5 am: 628229b3cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I5b4ca9cd06f008d6a02b1557860b71e126a8495d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:56 +00:00
SongFerng Wang
b37793b2fe Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: 31fed0ace4 am: 42af662d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: Ib7a3294e65b510fbd9c7cfe2989f50c7420d5c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:48 +00:00
SongFerng Wang
492075f6f2 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 am: 86fd225f79 am: a575d9bed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I6919b4f8203ea14f9d40387460c52684b694fc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:40 +00:00
TreeHugger Robot
9a9de52dbb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55f7c9c2dde221d6d9d472f24c897919e1b21a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:40:29 +00:00
Bill Yi
a21e6047d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f98aca0e386896c18cd8f74ce51b4358c6f1b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:40:24 +00:00
TreeHugger Robot
97da3dde63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7cc722182b2d26f436105378cf83574a26171d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:40:07 +00:00
Bill Yi
0a567537cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ec0894aa57e56e71426f800b122046db4471eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:39:46 +00:00
Betty Chang
713531c652 [automerger skipped] Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d am: e300781fb8 -s ours am: 34c513f0d4 -s ours am: d1e2280136 -s ours am: 1fbc7f2e58 -s ours 
am skip reason: Merged-In I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427 with SHA-1 dacce1fae3 is already in history

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

Change-Id: I900acd90cbba67c635e53cae2e4890192fc73035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 21:28:52 +00:00
Automerger Merge Worker
be7287840a Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp am: fd82bd854e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527

Change-Id: Ic2007474306dfefa55b6ee1db15c781ca5dca346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:07:31 +00:00
TreeHugger Robot
4f77fe31cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours am: 8961fbeada -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67bfeaaa818552b3fba439f41b183ee9979d43f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:07:09 +00:00
TreeHugger Robot
60ed9dbd53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 0a6b06ad2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84bbae7dd3b62f8d91e90a44afed0a0ac4faec31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:55 +00:00
Bill Yi
3f1595dfb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: 6352a444cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12e1990cfd194b4f0696a414c9b8013d34aa62e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:45 +00:00
TreeHugger Robot
d6db69358c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: d221387e32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0383c6ad130b1fb9ab77e90a2becf4ac1879a58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:29 +00:00
Bill Yi
944416da76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: 5c1d9fb325 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35315fdb8fc4ba969819ab625bef7039fde62e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:11 +00:00
TreeHugger Robot
ab134299ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 7b75a759ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08d2bf4a2e334c3646b7da5a3ee604e49d5ffdf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:41:38 +00:00
Bill Yi
f16931bcd5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: f3ba7e3f06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3631c73faa64d9783d04027e2ce3e1e14817beec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:41:29 +00:00
TreeHugger Robot
4f5208759c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: 2ba92e1138 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a33f067121867a97bec28d5a47c0c3288feaeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:41:14 +00:00
Bill Yi
c5c54308a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: fcf0332625 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b4dad4b7b9d720dab4ead8b05085f99ea9138e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:40:55 +00:00
Automerger Merge Worker
fd82bd854e Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: 496b722a23 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 7307f75d1e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: 684e2ab4bd -s ours
 2022-05-27 17:16:07 +00:00
TreeHugger Robot
8961fbeada [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d4f41f4aa4f17c2e770edc58f4068d076e568c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:15:14 +00:00
Bill Yi
cdd9bce547 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: 496b722a23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c6b803fbeedab5f119176aee5e0756e9335c67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:15:02 +00:00
TreeHugger Robot
0a6b06ad2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2af98aa8a4a359128f1b8f590c1acd066e560f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:14:45 +00:00