| commit | 4e5a7bfaa38e96b09d4f22d132d8b11d4b8a445f | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Thu Mar 25 13:10:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 13:10:55 2021 +0000 |
| tree | d471fdb0b649005fd012afaded7c71635987eb0b | |
| parent | 94633a52ffd41d92f3488dd8b27eb2933a7c8ae5 [diff] | |
| parent | f08c2ce8a98f25b45185fafe0d0724a6491d304b [diff] |
[automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: cf1dc9f287 am: e648a78c15 am: f08c2ce8a9 -s ours am skip reason: skip tag Change-Id I69d449705b1dc541287c72af8dc7705dc4733109 with SHA-1 2cc371c74b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929 Change-Id: I02ac63b20048a4c91a821911c4db0b14805bdef3