tree 7d0f60429fb223dffa3098af305d7d22d44a5f05
parent fb0ca145aad064b93fcfeb45a12667cd3fb7a997
parent 12287b2c67a3c60e8264b7dd07b98c1fda56c537
author Bonian Chen <bonianchen@google.com> 1638168321 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638168321 +0000

Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4 am: 12287b2c67

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

Change-Id: I2b908084e6422e9ccbdba8fd5cf67bf123f3ec62