| commit | 006f1a69d0ee975148e4dc5e2023f0911190d2c3 | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Fri May 07 09:53:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 07 09:53:56 2021 +0000 |
| tree | 7606757d778c0f7d187aaebfacbf78cd5eba1928 | |
| parent | 19b0627ae69a6dee533231515065f1ba40bf4214 [diff] | |
| parent | ab0f3875c4d1d9bf656c2713d4807876741e5b69 [diff] |
[automerger skipped] Merge "Replace MAX_NETWORK_TYPE with TYPE_VPN" am: 9639cd6242 am: b293e99d25 am: ab0f3875c4 -s ours am skip reason: Merged-In I27579a942a0424db647ad1f3383db78d5a0c69a9 with SHA-1 afdb65906d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696985 Change-Id: Ifeceb015bca61dd6762c2787b52df4ee089c35bc