| commit | f9abdd195807900f0b7871b625e68d52c2768f3c | [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 | 388bff3bf6d7f63adbeaf1f37c470003baf1479c | |
| parent | 2864e8762481f32c14451d41e9cc3ef812f2a6e8 [diff] | |
| parent | 82131f1f829496be863b30b9724b1ee2fb99394e [diff] |
[automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: 0f114dff28 am: 22f8ded94a am: 82131f1f82 -s ours am skip reason: skip tag Change-Id I69d449705b1dc541287c72af8dc7705dc4733109 with SHA-1 865b4f2ade is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929 Change-Id: I02ac63b20048a4c91a821911c4db0b14805bdef3