| commit | b4ac20f26ba8e5244be64b852fe6111bed2473ac | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Thu Mar 25 12:30:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 12:30:18 2021 +0000 |
| tree | b0d2d87872574ab801ba4b0d2dde40c2a74ae775 | |
| parent | 22f8ded94ae2b2c601e67b3dc03a7fc4b0024e2e [diff] | |
| parent | 3483ccf883d1b97e666dbbef8419c63566d4c87b [diff] |
Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946 Change-Id: I3be5109c253365b3c5bc56ae48114f8e37c4f153