tree aae92f1deafda7614e4749f3f8c40b793cc6b6f4
parent faf7f19d8265e389899062ae9070b2f6c3a836fb
parent 590e191ab5ffb6e85f38d0723f38a5cfb2cc1bb2
author Chenbo Feng <fengc@google.com> 1559185291 -0700
committer android-build-merger <android-build-merger@google.com> 1559185291 -0700

[automerger skipped] Merge "Add server information for pptp vpn" into qt-dev am: 4311022170 -s ours
am: 590e191ab5 -s ours
am skip reason: change_id Ia6b00dd88f8f31823647c56c20b8c7edd20280f7 with SHA1 b38065dd3a is in history

Change-Id: I7c66155046f67c7d14417bba1f7a0830d53d9e71