| commit | 1f8cf93aa44d98f716f54585f80a80f7164f5abf | [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 | d471fdb0b649005fd012afaded7c71635987eb0b | |
| parent | 4e5a7bfaa38e96b09d4f22d132d8b11d4b8a445f [diff] | |
| parent | a14890179bfbd5d4e5cee1b231cc4ca77aec3b9d [diff] |
[automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890a0 am: d734d34703 am: a14890179b -s ours am skip reason: skip tag Change-Id Ic52864003fbebd9f4e95d43fefc2e168437b0122 with SHA-1 1ef9b4d463 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946 Change-Id: I9f037314105a92d95394f55058bdbdeefd05b9c9