PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,134 Commits 1 Branch 0 Tags
322196cfce739a96685de7e9f20715c11936c43c
Commit Graph

103134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
5751635a03 [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: 59ecb81133 -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: I9cfcc382d3ac00b1015517cf399c22e4f4802946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:02:17 +00:00
Tom Hsu
a9d7aae694 Merge "[Panlingual] Fix the back button press" into tm-dev 2022-04-07 02:52:23 +00:00
Tom Hsu
94b0789323 Merge changes from topic "presubmit-am-f6b1787fd0f3424db0a7a4bb5c8bd472" into tm-mainline-prod 
* changes:
  [automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3
  [Panlingual] Fix the back button press
 2022-04-07 02:52:23 +00:00
Bonian Chen
5bcd2f7fa5 [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: a171ca8477 -s ours am: c5c5072587 -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: If24a54c4e68cbeede4352be068af500e3116941e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:42:24 +00:00
Bonian Chen
9c11a15f75 [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: a171ca8477 -s ours am: c5c5072587 -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: Ie1b6b953e57a49c787ae3c3744ea5f2889aae2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:41:52 +00: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
Arc Wang
877a41b054 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
 2022-04-07 10:39:13 +08: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
c5c5072587 [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: a171ca8477 -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: I8c700c4d502a8fded1048daedba5fb8098a53714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:25:43 +00:00
Bonian Chen
ea00d1ae28 [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: 10dcc4bf9c -s ours am: 7a9fda2691 -s ours am: cbf8100332 -s ours am: 6f757e5204 -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: I9c8bcc85da3e569f3c0546b850d6fafd97590239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:04:14 +00:00
Bonian Chen
7c3fd8d8df [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: 0293401f09 -s ours am: aa208d9ad6 -s ours am: 76206644d1 -s ours am: 95218d221f -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: I6ebb1997c8631c61ef7d6d8509869dec215cddf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:04:13 +00:00
Bonian Chen
09c6dc24e0 [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: da5f4be369 -s ours am: dcbe3315c2 -s ours am: 4a77355af6 -s ours am: 0e47b74210 -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: I359859195e7f71fc075ceb179d6952b005183d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:04:00 +00:00
Bonian Chen
c570e0aedb [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: 6e2a866bef -s ours am: f7d2fbdc88 -s ours am: 8012ed420f -s ours am: b7cdad31fe -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: I03cbc45d4151c2baaef55c49f8edaa21e880d9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:59 +00:00
Bonian Chen
6427f9884a [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: c9f5c30e04 -s ours am: eab9c0baf9 -s ours am: 0973ccb0e7 -s ours am: 711eae4650 -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: I6d72469e54395a24e5cbae6c8705982d2c49dd7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:48 +00:00
Bonian Chen
f036407298 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours am: 351e22f8e2 -s ours am: 79238cbd50 -s ours am: c613394e88 -s ours am: 596513cbc5 -s ours am: cc40b60988 -s ours am: ead0035784 -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: I2398c6aee6c4896768255ce033ac3ef5b8a3d166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:47 +00:00
Bonian Chen
7ce982d710 [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: ee79190be9 -s ours am: aa4b1c4087 -s ours am: 1b41873057 -s ours am: 0b8c2ad714 -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: I9bc24737b185c8cffda6d7938f85e01046fb8e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:36 +00:00
Bonian Chen
f95effca60 [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours am: 3c651042ba -s ours am: 5305cceda7 -s ours am: 353289122c -s ours am: 60ead8796f -s ours am: d56011040a -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: I73314b4e3c00bac883f72c6132302ea0227bff5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:35 +00:00
Bonian Chen
e69428ef55 [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: 2b767881d6 -s ours am: a6e2ce6e95 -s ours am: 6d6e40b5a5 -s ours am: da5676d4ea -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: Ib5b018beac7903433334696b48f6764a7ae8f477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:25 +00:00
Bonian Chen
02d566b6b1 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours am: 275f38c554 -s ours am: bcfc0913fa -s ours am: 5de1e4e244 -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: I92a5736f7d59b4a5a6002421d7999027e4f78abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:24 +00:00
Bonian Chen
4671d36900 [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: dad1ee3deb -s ours am: 0382c98491 -s ours am: 8254eaf6e5 -s ours am: 4cb8514e55 -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: Id9db7d7eb8bc5ee4150de30fd1bc7eea0e8fea53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:12 +00:00
Bonian Chen
1cc9cf2204 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours am: 663715de66 -s ours am: 62e59a727a -s ours am: bff0b04656 -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: Ifdd9f727571263c49ca39c9fd46bb7acc2d87ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:11 +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
98c495859c [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours am: fdc7764eff -s ours am: c95c6de8b5 -s ours am: 20a2d95a3c -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/+/16341972

Change-Id: I39fcc14177d04a31682048d77fd1bd1417a8dc31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:02:46 +00:00
Bonian Chen
a171ca8477 [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: I5b13cb302d6d75a217428c05401ae52e6a9b1a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:02:04 +00:00
Bonian Chen
6f757e5204 [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: 10dcc4bf9c -s ours am: 7a9fda2691 -s ours am: cbf8100332 -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: I81e9bf1cad045be5b016cdea442761cc036d9ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:31 +00:00
Bonian Chen
95218d221f [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: 0293401f09 -s ours am: aa208d9ad6 -s ours am: 76206644d1 -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: If0d2115228f64ecc342c0de9d462a15841099dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:30 +00:00
Bonian Chen
0e47b74210 [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: da5f4be369 -s ours am: dcbe3315c2 -s ours am: 4a77355af6 -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: Ic47513fe0397738435fb796861ce123f803111de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:21 +00:00
Bonian Chen
b7cdad31fe [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: 6e2a866bef -s ours am: f7d2fbdc88 -s ours am: 8012ed420f -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: I8ef48e43b355b83aaabe723336f6e300f50fcb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:20 +00:00
Bonian Chen
711eae4650 [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: c9f5c30e04 -s ours am: eab9c0baf9 -s ours am: 0973ccb0e7 -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: I7b867e19d7b985a90b3c4b19550eb0b291893642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:12 +00:00
Bonian Chen
ead0035784 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours am: 351e22f8e2 -s ours am: 79238cbd50 -s ours am: c613394e88 -s ours am: 596513cbc5 -s ours am: cc40b60988 -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: I30d5960346f6416078fad99df3a378d16441cffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:11 +00:00
Bonian Chen
0b8c2ad714 [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: ee79190be9 -s ours am: aa4b1c4087 -s ours am: 1b41873057 -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: I9fa2857f5b574d4cff7eba8506a78562c8befc5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:03 +00:00
Bonian Chen
d56011040a [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours am: 3c651042ba -s ours am: 5305cceda7 -s ours am: 353289122c -s ours am: 60ead8796f -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: I8c105d244b31aed8deb59b9a7530b1b8db1c1231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:03 +00:00
Bonian Chen
da5676d4ea [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: 2b767881d6 -s ours am: a6e2ce6e95 -s ours am: 6d6e40b5a5 -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: I8dad18856662585afa3f5ba1487a050321aa365c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:55 +00:00
Bonian Chen
5de1e4e244 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours am: 275f38c554 -s ours am: bcfc0913fa -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: Ie1768f6881c9bbbcd5ac6ef1a4e77b1cf26d12c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:55 +00:00
Bonian Chen
4cb8514e55 [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: dad1ee3deb -s ours am: 0382c98491 -s ours am: 8254eaf6e5 -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: Idfc5967ada272fd13e147f3b59848cad2b4e39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:47 +00:00
Bonian Chen
b749b06269 [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: 10dcc4bf9c -s ours am: 7a9fda2691 -s ours am: ee62abf8d2 -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: Ic5eca8e1848de83a232758ac196ed7e36d7de48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:47 +00:00
Bonian Chen
bff0b04656 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours am: 663715de66 -s ours am: 62e59a727a -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: If6eed5dd6ed360ae1f8c0dec12d2a8c03b76f235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:46 +00:00
Bonian Chen
3fbfac2adc [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: 0293401f09 -s ours am: aa208d9ad6 -s ours am: 6ac3c82c8e -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: I58140d1bd20bab030bf13fe3cc27357ad64bc695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:46 +00:00
Bonian Chen
20a2d95a3c [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours am: fdc7764eff -s ours am: c95c6de8b5 -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/+/16341972

Change-Id: I288019aa868663fcfe3b469630d6b949d616ce1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:39 +00:00
Bonian Chen
5ae34df566 [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: da5f4be369 -s ours am: dcbe3315c2 -s ours am: bbcf662b15 -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: I03f7687fb6c6f01650a877e39a7b2cc5b75c5ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:34 +00:00
Bonian Chen
eb91ac3d4b [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: 6e2a866bef -s ours am: f7d2fbdc88 -s ours am: 200057c318 -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: I9aa49f39601a0d5d91601f66e9143a44047b165c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:34 +00:00
Bonian Chen
d48c5e69ce [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: c9f5c30e04 -s ours am: eab9c0baf9 -s ours am: 5a05ef8329 -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: Ia88a79483c1e81e5ce4ee9cfa03389b15cd37bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:22 +00:00
Bonian Chen
92d6c0442a [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours am: 351e22f8e2 -s ours am: 79238cbd50 -s ours am: c613394e88 -s ours am: 596513cbc5 -s ours am: 42d2e3bd6e -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: Ia8289680d95b32aaf5d2e2203ab803e08dbfd381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:22 +00:00
Bonian Chen
509aafa5ef [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: ee79190be9 -s ours am: aa4b1c4087 -s ours am: de36f6ab73 -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: Ia990a90ffa52b6262ded31eb9dccec0c949eb21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:11 +00:00
Bonian Chen
ba6a50b3fe [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours am: 3c651042ba -s ours am: 5305cceda7 -s ours am: 353289122c -s ours am: 30118006cb -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: I5c01a03ef4a0c17ec916f3ed08e6335e00f85e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:10 +00:00
Bonian Chen
204e4362d9 [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: 2b767881d6 -s ours am: a6e2ce6e95 -s ours am: ce8d7ffde4 -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: I0c65cbfc433757a9d0bf827ffd46dd5b874131aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:01 +00:00
Bonian Chen
b80dbc8fa8 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours am: 275f38c554 -s ours am: 9b748cd070 -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: If4f3345a34d92380d61add6fd2f3fe7baf63012f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:00 +00:00
Bonian Chen
76f4323603 [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: dad1ee3deb -s ours am: 0382c98491 -s ours am: 3fbb2430a9 -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: I1605f0f21c61f36d5eb615179b03a1e5243685a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:40:50 +00:00
Bonian Chen
e70ecf305d [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours am: 663715de66 -s ours am: 86eba73a1c -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: I449476ae2e44eaaeb5a000bcd1f4482e3a05553e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:40:49 +00:00
Bonian Chen
a56809e6ea [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours am: fdc7764eff -s ours am: 43d819dde1 -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/+/16341972

Change-Id: Ic0c00ec5d607d26ec02e36e25091022293381fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:40:41 +00:00