| commit | a14890179bfbd5d4e5cee1b231cc4ca77aec3b9d | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Thu Mar 25 12:39:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 12:39:43 2021 +0000 |
| tree | ab3ee716860c55bd159522a632ecc29bd0773c3d | |
| parent | f08c2ce8a98f25b45185fafe0d0724a6491d304b [diff] | |
| parent | d734d3470330cb43625a4570116ba6d34922b15c [diff] |
Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890a0 am: d734d34703 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946 Change-Id: Iaad97aa7b05f7583fc740d0bdaeffd8f23566086