tree 5116604d4b0e995537cee174d9174a650307691a
parent 1b5fc73ae98d5e3b7d2c1f10d9dcbc2749355d3e
parent a378c558d64867008f4344490e3df4706e965fa7
author Alistair Strachan <astrachan@google.com> 1559112507 -0700
committer android-build-merger <android-build-merger@google.com> 1559112507 -0700

[automerger skipped] Try OPNS/OLAC before PPTP/L2TP
am: a378c558d6 -s ours
am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history

Change-Id: Iff378e03bc77456d848c051c92db0c8346ca30be