Automerger Merge Worker
17027f55bf
Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours am: 963c939143 -s ours" into sc-dev
2021-03-11 11:05:06 +00:00
Automerger Merge Worker
8b747a8637
Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 4989788b15 -s ours" into sc-dev
2021-03-11 11:05:02 +00:00
Andras Kloczl
e8a52ca61d
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours am: 963c939143 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib888b7720c7f5cea953f0a10b0fdba3d525f637c
2021-03-11 11:05:01 +00:00
Andras Kloczl
5a35753e22
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 4989788b15 -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4c8416cc204cdc47b5c321f0489e0b16e4537e7
2021-03-11 11:04:57 +00:00
Andras Kloczl
9b6dcc321f
[automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours am: f9eacae4a0 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf579ecf5584d3e801f3abe6affc3a087b47527e
2021-03-11 11:04:55 +00:00
András Klöczl
203585f40d
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours am: a8dc64691b -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I89c90cfd7805700a5bdc957594280ee511eb9690
2021-03-11 11:04:49 +00:00
Automerger Merge Worker
638a96896e
Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours" into sc-dev
2021-03-11 11:04:46 +00:00
Andras Kloczl
61bfba4ebd
[automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours
...
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9747b01a4e5bf509be2f37b613832ba76d69e8e1
2021-03-11 11:04:41 +00:00
Andras Kloczl
73f14dcdf2
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7ed616c466 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a2c840e5b840a9fc8bd7ff10844baa78ae5c299
2021-03-11 11:04:40 +00:00
Andras Kloczl
5133ac1f70
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 6355d222cd -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I50645dca96e12c459ea9dd65b35cf7c0d9643fdd
2021-03-11 11:04:33 +00:00
Andras Kloczl
4989788b15
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85edfd864b3d25d5616f65e0b78c630800b8ba7b
2021-03-11 11:04:11 +00:00
András Klöczl
a8dc64691b
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7dcea0dea2ecbdfd2f997801f8003ae347f49b9b
2021-03-11 11:04:03 +00:00
Andras Kloczl
7ed616c466
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53017d6891c267f1023198cd5e53887d15c30aeb
2021-03-11 11:03:54 +00:00
Andras Kloczl
d065d46ab9
[automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c am: 7f3b720d75 -s ours
...
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf25ad74a40c868f9b02bbf2f0de1b915f7ee68a
2021-03-11 11:03:12 +00:00
Andras Kloczl
cb10105fe1
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I668e9b33db1da19a9c8f3962df55354887d07309
2021-03-11 10:59:57 +00:00
András Klöczl
fca809b408
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb18b517ec93e78c3a32d2276948703764387350
2021-03-11 10:59:37 +00:00
Andras Kloczl
4f095b1a6b
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If83710ea2b67104d3f3cbc1ce55f32ed129770cf
2021-03-11 10:42:24 +00:00
András Klöczl
e690821501
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2052e3022c61172aac54fb1855d500eb3f0755a
2021-03-11 10:42:15 +00:00
Andras Kloczl
a95829294d
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4017e71f1c6b9f6a1eee1cde5d8c3534fa4a4ed5
2021-03-11 10:42:06 +00:00
Andras Kloczl
6355d222cd
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I745498eef55d159e98e6d1b2d549fc20a05c59e4
2021-03-11 10:28:59 +00:00
Andras Kloczl
b21072b773
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41fd0e7c9aaef6aa0f4d0784ba916612f95e89dc
2021-03-11 10:28:53 +00:00
Andras Kloczl
7f3b720d75
Prevent using invalid result uri during multi user image change am: e36357b20c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1a8977045597d896bd58ace3f2319aefbd86858
2021-03-11 10:28:52 +00:00
András Klöczl
28539c02dd
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bfc7671ae0401b97ec24b32c53146926490809f
2021-03-11 10:28:43 +00:00
Andras Kloczl
963c939143
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia7025da5c224cb2f0ce92e31e8b3f9645c588701
2021-03-11 10:24:42 +00:00
Andras Kloczl
f9eacae4a0
[automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 07e414017c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1081ba90dd6e3b49489237b60ac14496ec419617
2021-03-11 10:24:33 +00:00
Andras Kloczl
94ed37dacf
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia7e57866c554495b9f8fd8b48b9c03ccde9f8160
2021-03-11 10:24:31 +00:00
Andras Kloczl
1d48089aa2
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad298e6c9211ca2af4ba36be3d6b40cc634e3394
2021-03-11 10:24:30 +00:00
Andras Kloczl
c40b15712c
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I155c9ce1031960174f802c15102d3c2a3619bfb6
2021-03-11 10:24:25 +00:00
Andras Kloczl
0e9cbfc86e
Prevent using invalid result uri during multi user image change am: 07e414017c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98dd17745edd2e700169959537e640a33b81e07b
2021-03-11 10:24:24 +00:00
Andras Kloczl
94872d6be0
[automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 07e414017c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58a14824bee13043f07ced00fd31bae1a6d14526
2021-03-11 10:24:19 +00:00
Andras Kloczl
373b53a7cc
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c374ecf934e3356f6d656908dab6f02ab215763
2021-03-11 10:24:17 +00:00
András Klöczl
f1125282f9
Merge "Prevent using invalid result uri during multi user image change" into pi-dev
2021-03-11 09:48:07 +00:00
TreeHugger Robot
4082b27b0a
Merge "Declare activities for factory reset pages" into sc-dev
2021-03-11 09:05:58 +00:00
Wesley Wang
1d5d101aa6
Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev
2021-03-11 07:53:12 +00:00
Arc Wang
3d1658e93d
Merge "Hide non-system overlay window on ActivityPicker" into sc-dev
2021-03-11 07:45:43 +00:00
Wesley.CW Wang
e940dcb448
Update UsageProgressBarPref icon when device is charging or low battery
...
- Add new icon for battery low state
- Update UsageProgressBarPref icon when charging or low battery
Screenshots:
https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
https://screenshot.googleplex.com/85NWXSg2PevXAsy.png
Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
2021-03-11 06:32:20 +00:00
TreeHugger Robot
53d7495162
Merge "Use title area for enrollment error messages" into sc-dev
2021-03-11 06:16:42 +00:00
Yi Jiang
5c11109ffc
Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev
2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-03-11 12:10:18 +08:00
Treehugger Robot
2817c677b1
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
2021-03-11 02:41:39 +00:00
Kevin Chyn
13b05b6fb8
Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev
...
* changes:
Update fingerprint revokeChallenge with frameworks/base
Update revokeChallenge together with frameworks/base
2021-03-11 01:14:15 +00:00
Treehugger Robot
dac69ccd8f
Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74024fbb550f8c405f2850bd20b90599370b0bad
2021-03-11 00:58:01 +00:00
Andras Kloczl
6746add669
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:46 +00:00
Andras Kloczl
9c0024f455
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:03 +00:00
Andras Kloczl
e0f8214e80
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:14:59 +00:00
Andras Kloczl
07e414017c
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:13:05 +00:00
Abel Tesfaye
bf182903ed
Merge "Update autorotate search terms" into sc-dev
2021-03-10 23:25:37 +00:00