| commit | 72e040d15e71eb226070e6a18edaf1bc3b17df18 | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Thu Mar 25 13:11:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 13:11:34 2021 +0000 |
| tree | 388bff3bf6d7f63adbeaf1f37c470003baf1479c | |
| parent | f9abdd195807900f0b7871b625e68d52c2768f3c [diff] | |
| parent | 4b44bfce87a81eb897416abd26bd24fe92978dda [diff] |
[automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883 am: b4ac20f26b am: 4b44bfce87 -s ours am skip reason: skip tag Change-Id Ic52864003fbebd9f4e95d43fefc2e168437b0122 with SHA-1 2e4bc41b5b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946 Change-Id: I9f037314105a92d95394f55058bdbdeefd05b9c9