PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,054 Commits 1 Branch 0 Tags
32381c7e8bd13a73298fea7a79c83bf0136453ab
Commit Graph

108054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
32381c7e8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: 28d5ffe9a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5333f30565a106b7cbc0bbb1d338769bfc189122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:44:53 +00:00
Bill Yi
28d5ffe9a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib108c314f79f1fc0cc71ec9cb37b6d4f33e3bc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:17:57 +00:00
Amy Hsu
bb1c1a9954 [automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: ef540c685d -s ours 
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 7087e5c457 is already in history

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

Change-Id: I9792a751ac493ecf4435a19f129d5590bedc1752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:48:32 +00:00
Amy Hsu
a067fba01f Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: f51951c9d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: If81fa8f115b89eb458b02736276940d8148458e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:47:15 +00:00
Amy Hsu
ef540c685d Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: I7f6bf6ad05de82ad77ced5bd776c3602f4057290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:15:31 +00:00
Amy Hsu
f51951c9d3 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev 2022-07-12 03:54:27 +00:00
Robert Luo
55db71536c Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev am: bc66c0aba9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589

Change-Id: I6e7fa3acabc6b9fff62eb73fe2c47a915c4f13f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 00:00:20 +00:00
Hugh Chen
e88be4859c RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589

Change-Id: Ida6c1387588887b78f33de9f655b5397d04c4258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 00:00:14 +00:00
Robert Luo
bc66c0aba9 Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev 2022-07-11 23:36:02 +00:00
TreeHugger Robot
92e7da84e2 Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev am: f38e8e6194 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588

Change-Id: Ib61748c3a5bfd25049c4020a162b067584fb037e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 23:09:54 +00:00
Hugh Chen
95d2add6a2 RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588

Change-Id: I6ba14905e50fb1fad3036cd91a8d2c9ceac2621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 23:09:47 +00:00
TreeHugger Robot
f38e8e6194 Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev 2022-07-11 22:50:58 +00:00
Grace Cheng
d39bc04b42 Display screen protector string and icon in fingerprint enrollment only on relevant devices am: 3c53dac81b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19224339

Change-Id: I4c9214324c86cc1070e2cec06a46f761b4afc689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 19:27:00 +00:00
Bill Yi
3d4eb4f4b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I043b44e648cce2709d66ea0b0cdc4c367de844d6
 2022-07-11 11:59:15 -07:00
Grace Cheng
3c53dac81b Display screen protector string and icon in fingerprint enrollment only on relevant devices 
Sets screen protector string and icon visibility to visible on UDFPS, and non-visible on non-UDFPS devices

Fixes: 230156966
Test: Navigate to fingerprint enrollment page to see string & icon are
gone on side-FPS device

Change-Id: I527fb0d944a7c8180297ad44efa3e9bba3012703
 2022-07-08 23:39:32 +00:00
Bill Yi
c4f67d32b4 [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours am: 40bd36207e -s ours am: 46b5269704 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f04dbcf22a727ed54e9de4edaa82dc148d74b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:57:52 +00:00
Bill Yi
333191334a [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours am: 588a5a1577 -s ours am: 5b0b300d4d -s ours am: cc6cd60c19 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56e76839da1f42fd177951abd07f43f94b3fbb4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:57:33 +00:00
Bill Yi
46b5269704 [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours am: 40bd36207e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I021fd2f8d5b94fd97e3eb44b49ba80db2688bd3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:34:37 +00:00
Bill Yi
cc6cd60c19 [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours am: 588a5a1577 -s ours am: 5b0b300d4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27f6876d85ea0a65ad898391cc22dbfbd1d6cc09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:34:24 +00:00
Bill Yi
40bd36207e [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia37728c78d3f27a651ae620d52be0f5b4aa7f18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:08:08 +00:00
Bill Yi
5b0b300d4d [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours am: 588a5a1577 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I187c11de027edbb3af45aad590f5ecbccce22d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:07:52 +00:00
SongFerngWang
0f3d08a28c [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3 am: 4a48dc5e96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I7f60ecf63a401f2a1e811d7097fea90dfe3ed781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:06:36 +00:00
Bill Yi
2800a2b1ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours am: 75bbbd7e94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c87c1a526f94fb0cc30996143a6799cf02c10f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:04:35 +00:00
Bill Yi
4bb22b64c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours am: 1e80eafe18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I278fa56bde679385ee6808b93f960ffe817c380b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:04:27 +00:00
Bill Yi
bf70c2e9e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours am: 8802d04401 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35c4c58e704afb40f939015b10d1d7f4bcd72357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:04:20 +00:00
Bill Yi
f2b015078d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: 09b0e3ecd2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f1dede35bec9c749087aa250d1c014e797f637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:00:44 +00:00
Bill Yi
f0fda8ed36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 6f2d360a38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95e171c52ec24612e9ea1ec8f512d7fc62c9eb4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:00:29 +00:00
TreeHugger Robot
512c7de992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours am: b182c27349 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc1f094fc36d0e6f5e1bfcca1eaa37d4e44dcea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:59:09 +00:00
Bill Yi
228a4e3c40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours am: 75ad2310e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c14a5bb425edfc496f47144665b5bd173008ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:58:59 +00:00
TreeHugger Robot
3dc5c2ab32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours am: bdceb524a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2056ef3d6d5abde33c6532a0cd8a82ac5bb2fba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:56:56 +00:00
Bill Yi
44bc157e7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours am: 5dae5623ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib986109ee5b23a57c0475f1b20025d2335c1f975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:56:52 +00:00
Bill Yi
e86b42302d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours am: d656305b74 -s ours am: c4ff0995f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I313619c0ebb036c24feae5ec4a27c06958932540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:54:10 +00:00
SongFerngWang
4a48dc5e96 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: Ib1c261e07e1878b60bd067694e19eea92bb11866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:47 +00:00
Bill Yi
75bbbd7e94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1563e164994b59d9bb16972a6ec1f55d9237a20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:05 +00:00
Bill Yi
1e80eafe18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60a66ff7f0ce28070f827c380871914b0265c9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:44:59 +00:00
Bill Yi
8802d04401 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a725066560165e538b616b8078ba51e5565bdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:44:50 +00:00
Bill Yi
09b0e3ecd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08ee4c34afc8f86ddaf2e5c4e01015387210c655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:41:56 +00:00
Bill Yi
6f2d360a38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45a63dc4fecdc183e55803bf7989e10d92fe5b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:41:42 +00:00
TreeHugger Robot
b182c27349 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I098ee079462a0f7cd85aa22516bb0b80b85cb0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:38:30 +00:00
Bill Yi
75ad2310e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46a8c6924ee60efb5dcb7c895af54c5d317a57d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:38:21 +00:00
TreeHugger Robot
9e388f0f07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours am: ed552ecb6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6add0766b7198cd640e499eb8004d28657849ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:37:18 +00:00
Bill Yi
7eb6dd635b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: e5e9661324 -s ours am: 0dbf58c5c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05f68b58538a7fe042cb4451d54740e2a3346651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:37:03 +00:00
TreeHugger Robot
bdceb524a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8420909a0317ffe1fc68fe31dc5c54bdcda41f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:47 +00:00
Bill Yi
5dae5623ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic18cefcfec061a2c91cd3bd943c2d6f714afbdc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:45 +00:00
Bill Yi
43bed90ebd [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4594325b6809e67239f58366a67f4487e963b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:21 +00:00
Bill Yi
588a5a1577 [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d2d69938247a8c9e5b6eaf778631f172d0ecc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:05 +00:00
Bill Yi
c4ff0995f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours am: d656305b74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d06476ca757e386d8e5c127d7454b0455048e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:33:15 +00:00
TreeHugger Robot
ed552ecb6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1db9d46a3fdd80511cbace631c180b7d8aac0767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:28:11 +00:00
Bill Yi
0dbf58c5c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: e5e9661324 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2dc614515ce369e668fea2724c29cfa2a834483c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:27:56 +00:00