| commit | 4b44bfce87a81eb897416abd26bd24fe92978dda | [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 | b0d2d87872574ab801ba4b0d2dde40c2a74ae775 | |
| parent | 82131f1f829496be863b30b9724b1ee2fb99394e [diff] | |
| parent | b4ac20f26ba8e5244be64b852fe6111bed2473ac [diff] |
Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883 am: b4ac20f26b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946 Change-Id: Iaad97aa7b05f7583fc740d0bdaeffd8f23566086