Arc Wang
b55e56b5a9
[automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855
-s ours am: 017fe0895f
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096
Change-Id: I4511c5642bc67356e3414a4ca723094ef45f2282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 02:10:51 +00:00
Arc Wang
e29e6ba72e
[automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
am: 3357f3071a
-s ours am: 31c51f18fc
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096
Change-Id: Iff0b47ee51292c1b7f408691c8cbb63543b1b093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 02:10:46 +00:00
Arc Wang
017fe0895f
[automerger skipped] Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev am: c2c5b15855
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096
Change-Id: Ie8771d1f169bb4299b0aafce6ced2dae9e8cf270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 01:36:02 +00:00
Arc Wang
31c51f18fc
[automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
am: 3357f3071a
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096
Change-Id: I856e903afba4e53c2a527886f7fab8527e427349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-08 01:36:01 +00:00
Arc Wang
c2c5b15855
Merge changes from topic "presubmit-am-3cc3de9f6a154c869e57eba3d059bade-sc-dev" into sc-qpr1-dev
...
* changes:
[automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
Hide non-system overlay window on ActivityPicker
2022-04-08 01:01:27 +00:00
Arc Wang
581c11eafe
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: 4433b23ba9
-s ours am: 7b2c130b51
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 21:13:47 +00:00
Arc Wang
77db4bf946
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 4f2a4c2036
-s ours am: 561bb2f83e
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: Iba131858c4965835bf5ea7636cd66f6533d02510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 21:13:39 +00:00
Arc Wang
7b2c130b51
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours am: 4433b23ba9
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Ib63653a11e9874c656bd2dd997f67a2b59d2788c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:59:13 +00:00
Arc Wang
561bb2f83e
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
am: 4f2a4c2036
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: Id6964b2ad98a10ec99d77d3fc08887affa204340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:59:06 +00:00
Arc Wang
4433b23ba9
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours am: 038da819d2
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Iad907d4b02e7e2406aca918d8841d21aceab12e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:33:34 +00:00
Arc Wang
4f2a4c2036
Hide non-system overlay window on ActivityPicker am: c55b5b54d2
am: fcf0584f93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I385f1718bdc0810db374edff607a5d088caffa52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:33:29 +00:00
Arc Wang
038da819d2
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours am: 346ab35fc4
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I705269b27f44fd7335013ff728113a12f088bc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:32:16 +00:00
Arc Wang
346ab35fc4
[automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
am: e5e271bfed
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: If996f3775f8de7981af3409129d8d5254b470b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 20:05:45 +00:00
Arc Wang
fcf0584f93
Hide non-system overlay window on ActivityPicker am: c55b5b54d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098
Change-Id: I5404085011ef8f1120e0a8239e4049d617716690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:59:23 +00:00
Arc Wang
e5e271bfed
Hide non-system overlay window on ActivityPicker am: c4121c15e4
am: 21a0db9882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: Id6820351a67c2b2924a9a6ee3a06731519510ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:44:36 +00:00
Arc Wang
21a0db9882
Hide non-system overlay window on ActivityPicker am: c4121c15e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100
Change-Id: I54645a67488b6c155218eca6c5fb5779daabd495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 19:15:23 +00:00
TreeHugger Robot
eb37fe4394
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628095
Change-Id: Ib6f01b1895df56eb5b8d7e57cd19ddae3dfaba59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 18:24:45 +00:00
TreeHugger Robot
df06dcecbe
Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev
2022-04-07 18:08:21 +00:00
Arc Wang
c4121c15e4
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: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:44:12 +00:00
Arc Wang
c55b5b54d2
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: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:42:02 +00:00
Arc Wang
3357f3071a
[automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096
Bug: 181962311
Change-Id: Ia1f3c9944e2ef886366719b754c89e7c4d99478a
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:38:36 +00:00
Arc Wang
d0a23dc840
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: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:38:24 +00:00
Arc Wang
1c8edd20a3
[automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628095
Bug: 181962311
Change-Id: I7f99b94832948db188ddd45fd5e2a87ebc28af6f
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 03:35:48 +00:00
Arc Wang
b95bd5b449
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: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 11:33:54 +08:00
Bonian Chen
59ecb81133
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours am: 961d4b26b7
-s ours am: 8c89ac9027
-s ours am: ad3fef885f
-s ours am: 62694fefcb
-s ours am: b834eacedb
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: Id708691389716abaa0424a6dfde3f685df297409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:40:27 +00:00
Bonian Chen
b834eacedb
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours am: 961d4b26b7
-s ours am: 8c89ac9027
-s ours am: ad3fef885f
-s ours am: 62694fefcb
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I34086ad2baee255f9413529edcfed89cdc95eb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:25:48 +00:00
Bonian Chen
62694fefcb
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours am: 961d4b26b7
-s ours am: 8c89ac9027
-s ours am: ad3fef885f
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I5097c99851620d39004d0b62f6479d4d71b46d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 02:03:06 +00:00
Bonian Chen
ad3fef885f
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours am: 961d4b26b7
-s ours am: 8c89ac9027
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I912d9f1baa62559df394f95080fdde71ac91c318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:39:53 +00:00
Bonian Chen
8c89ac9027
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours am: 961d4b26b7
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I38b41e693d544fa9b44323f3b9d1d7a6c53690ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 01:15:26 +00:00
Bonian Chen
10dcc4bf9c
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5
-s ours am: e8097d4464
-s ours am: 35c5b0b0a2
-s ours am: c058392a70
-s ours am: 06b9bf362e
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: I2d02d8ae768192ec6928d8a365330731a023e3e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:46:01 +00:00
Bonian Chen
0293401f09
[automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491
-s ours am: eefa7371ed
-s ours am: fcdc4a4de3
-s ours am: b17f587257
-s ours am: f52fc37869
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: Ic2af2ee157cb8a07ef39af57b433bff4ee0520d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:59 +00:00
Bonian Chen
da5f4be369
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93
-s ours am: d15869f014
-s ours am: eedfefab4b
-s ours am: b82af15ea9
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973
Change-Id: I61aca50975ad4f35863edee2adadc50a55dee19e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:50 +00:00
Bonian Chen
6e2a866bef
[automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d
-s ours am: 96fe347312
-s ours am: 83e4693075
-s ours am: 8f9ade3eaf
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973
Change-Id: I35164868ba8f300bf72ca5c21930fcfcc19d91c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:48 +00:00
Bonian Chen
c9f5c30e04
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082
-s ours am: 771b606116
-s ours am: 7c93a31c72
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341972
Change-Id: I1493d49e64a2ff77c5a7f6370d61162adeab2db5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:40 +00:00
Bonian Chen
961d4b26b7
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I50b0f293bc021fe8f28fb1f10cb20bc93c75bcf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:39 +00:00
Bonian Chen
c613394e88
[automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639
-s ours am: 351e22f8e2
-s ours am: 79238cbd50
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341972
Change-Id: I3385d75cde5731ff6d30b2a0a55c3fc1eea8b182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:38 +00:00
Bonian Chen
ee79190be9
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d685
-s ours am: db51e0c04b
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341971
Change-Id: I2103c67411ccb792d833271a9e82cadecac653e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:30 +00:00
Bonian Chen
5305cceda7
[automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f
-s ours am: 3c651042ba
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341971
Change-Id: I90c6705b083b667931f8a52f44cc51c98ff83900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:45:28 +00:00
Bonian Chen
06b9bf362e
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5
-s ours am: e8097d4464
-s ours am: 35c5b0b0a2
-s ours am: c058392a70
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: Ic3d9c339402bc01aedadc6232270501203e45e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:40 +00:00
Bonian Chen
f52fc37869
[automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491
-s ours am: eefa7371ed
-s ours am: fcdc4a4de3
-s ours am: b17f587257
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: Ia31ea8fa8ca0cdd539e1842efc0cf0af2f61b845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:39 +00:00
Bonian Chen
b82af15ea9
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93
-s ours am: d15869f014
-s ours am: eedfefab4b
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973
Change-Id: I583f3af9e630046b485f58d15fdfbffa76088d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:31 +00:00
Bonian Chen
8f9ade3eaf
[automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d
-s ours am: 96fe347312
-s ours am: 83e4693075
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973
Change-Id: Ifba29937fc81a1591e4605437dec0df5ff943f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:30 +00:00
Bonian Chen
7c93a31c72
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082
-s ours am: 771b606116
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341972
Change-Id: I6d9cfd58a9b57141e20fb435eb6db668e16fb576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:22 +00:00
Bonian Chen
79238cbd50
[automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639
-s ours am: 351e22f8e2
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341972
Change-Id: If41c61bfe97231550c64c6da05471f72d2535a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:21 +00:00
Bonian Chen
db51e0c04b
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d685
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341971
Change-Id: Iaedf9edd1c38b7265c16927b3e5dba07ba0edaad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:13 +00:00
Bonian Chen
3c651042ba
[automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341971
Change-Id: Iebd5667f16d475d06834b2caf875e297c2d14716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:13 +00:00
Bonian Chen
c058392a70
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5
-s ours am: e8097d4464
-s ours am: 35c5b0b0a2
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: I5ef85a51130641bb7690d7de5e15ff6e350508ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:12 +00:00
Bonian Chen
b17f587257
[automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491
-s ours am: eefa7371ed
-s ours am: fcdc4a4de3
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341974
Change-Id: I93d97253b7686f176d2b5a2bb192a5d4ff1cf7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:11 +00:00
Bonian Chen
eedfefab4b
[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93
-s ours am: d15869f014
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973
Change-Id: Ia97c0a7c8667c952ec2e6e286a02d736bc526335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:04 +00:00
Bonian Chen
83e4693075
[automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d
-s ours am: 96fe347312
-s ours
...
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973
Change-Id: I2d597ac19b472b75fa776e207238c05d52f912af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 00:24:03 +00:00