tree 5392ce53b5e097820ac15416a2df9ac7669b701d
parent 386aeaa3d91ae11cc4a2dcd5345b479c5b02b2fa
parent b09793ab41950137361b32251ea6e14fe6a287c0
author Lorenzo Colitti <lorenzo@google.com> 1618369232 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618369232 +0000

Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: 7dc61be0da am: b09793ab41

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

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6