commit | c956cf9485aabf87854d778c504b89dfbd4f113e | [log] [tgz] |
---|---|---|
author | Alistair Strachan <astrachan@google.com> | Tue May 28 17:09:47 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 28 17:09:47 2019 -0700 |
tree | 5116604d4b0e995537cee174d9174a650307691a | |
parent | dbab6594bc99ab4026c051508af0bfe92487aef9 [diff] | |
parent | 7ea34f72130838330a8da5b0dd870943c873de44 [diff] |
Merge "Try OPNS/OLAC before PPTP/L2TP" am: 7ea34f7213 Change-Id: I598c09dbb46146c07e1703b0fccf85ed21b31ecb