tree 731fc4b4b473868b5aa945346b318d553f199a7f
parent fcdc4a4de3e715e5e6842b9cd395b90cbe1d3fce
parent e8097d44641facf82778dc4b389a9b90667184c5
author Bonian Chen <bonianchen@google.com> 1649290989 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649290989 +0000

[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -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: I74e55c981975f965e6cf42950b9642b17f891413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>