commit | c6a866fb4251310d78b87815ce69d83bd232fd8a | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Wed Apr 14 01:24:19 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 14 01:24:19 2021 +0000 |
tree | 71a0f98ec556de0d0dceacda443227193f8fee9a | |
parent | 32cf6f6f6be15c57091f11d9e390797f63cda544 [diff] | |
parent | 1479494fd5061b5c88692ec209527d090aebbd94 [diff] |
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568 Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf