tree 5116604d4b0e995537cee174d9174a650307691a
parent 11150b23b4769cb6e4b3613c3d47cfbead098cdf
parent 77cd51be3a10924fdbbc853d9a16ae92adb66b55
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1559112816 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1559112816 +0000

Merge "[automerger skipped] Try OPNS/OLAC before PPTP/L2TP am: a378c558d6 am: ca7860c5d1 -s ours am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history" into qt-r1-dev-plus-aosp