commit | a89340bf436fad31daf140b58a736b2b1ad31c34 | [log] [tgz] |
---|---|---|
author | Benedict Wong <benedictwong@google.com> | Wed May 27 17:57:56 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 27 17:57:56 2020 +0000 |
tree | 5f98cf56c6e6393fdd6b5e1778805ae2d7a7d94d | |
parent | 0a1b12278a6176519342920e3f0231d840d65ddd [diff] | |
parent | 03bf3af13906411c2cddd736b1677f557ac2e8b5 [diff] |
[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours am: 03bf3af139 -s ours am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history Change-Id: I5aa381f256c38f4e944147184ef03112769d37ed