tree bcf0eef60b477aef49daca182d79b45577aa2ad7
parent e6e739d8b0f097deb7bd725347d58367f5445264
parent d0888970a4874a6f7334222c333aca5c163fcebd
author Bonian Chen <bonianchen@google.com> 1649290996 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649290996 +0000

Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4

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

Change-Id: Iabf1f3d5b113e12ddfd1cfe1037a94fb4509e180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>