| commit | d734d3470330cb43625a4570116ba6d34922b15c | [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 | 82781f1aec336b0595aed739220d4c881dcaa0b4 | |
| parent | e648a78c1570a3f45bef66e04968060abc15935e [diff] | |
| parent | 8db8d890a0ddea05b725ba67f73b3796cb47c898 [diff] |
Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890a0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946 Change-Id: I3be5109c253365b3c5bc56ae48114f8e37c4f153