| commit | cb6798a90a753b357ca3b43831580df836b601bd | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Apr 14 03:00:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 14 03:00:32 2021 +0000 |
| tree | 0183d56923927458d39f7d86a1d9033e32232f07 | |
| parent | 49bae33c5ea8bc4a3b8251471bd9dfba0c2138ad [diff] | |
| parent | d76eb01fbeecbe2367014cfdf1d0365295bf89d0 [diff] |
Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42 am: d76eb01fbe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568 Change-Id: I1193382337088113bf64a636b0b70429d28f8be6