tree 71a0f98ec556de0d0dceacda443227193f8fee9a
parent 7d7b5bcb9f6da86ac1f363c21d833dc6afdc830a
parent c6a866fb4251310d78b87815ce69d83bd232fd8a
author Lorenzo Colitti <lorenzo@google.com> 1618367591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618367591 +0000

Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I3c13a27c78cb824d366095edbf37d30527978def