| commit | 1a4acce75322f449149df414c922b5f2492e7610 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Apr 14 02:33:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 14 02:33:11 2021 +0000 |
| tree | c27c0ffcbd57f883c02289240466bdbe49865d3f | |
| parent | 4f15a7cf47b777f83844d701f9fbb4573b8679fe [diff] | |
| parent | b2087b46354a9aff565e26c395a08e07fce67c48 [diff] |
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: b2087b4635 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568 Change-Id: I3c13a27c78cb824d366095edbf37d30527978def