summaryrefslogtreecommitdiff
path: root/framework/src/android/net/NetworkProvider.java
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2021-04-14 03:00:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-14 03:00:32 +0000
commitf40b20ec1c7c92db1aef411eabc7d51a2c873e1a (patch)
tree5392ce53b5e097820ac15416a2df9ac7669b701d /framework/src/android/net/NetworkProvider.java
parent386aeaa3d91ae11cc4a2dcd5345b479c5b02b2fa (diff)
parentb09793ab41950137361b32251ea6e14fe6a287c0 (diff)
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
Diffstat (limited to 'framework/src/android/net/NetworkProvider.java')
0 files changed, 0 insertions, 0 deletions