| commit | db8e99cd7364f49cac56e86935e75deb4cdefe8f | [log] [tgz] |
|---|---|---|
| author | Alistair Strachan <astrachan@google.com> | Tue May 28 23:58:50 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 28 23:58:50 2019 -0700 |
| tree | 5116604d4b0e995537cee174d9174a650307691a | |
| parent | f5192bf5fe5736d33a7c9bcce02e5fa47aa418d6 [diff] | |
| parent | 8c3910aa893077ffc768ebac081f21439b3ed0bd [diff] |
Merge "[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 am: ca7860c5d1 -s ours am: 8c3910aa89 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history Change-Id: I55a193dcf2e40c653d67b30091f8167f81d7e8a1