[automerger skipped] Merge "Add server information for pptp vpn" into qt-dev

Browse Source

am: 4311022170 -s ours
am skip reason: change_id Ia6b00dd88f8f31823647c56c20b8c7edd20280f7 with SHA1 b38065dd3a is in history

Change-Id: I88245117b4c90de8faa3d7976213249eaa73b9d4

...

This commit is contained in:

Chenbo Feng

2019-05-29 19:53:00 -07:00

committed by android-build-merger

parent c0274d1315 4311022170

commit 590e191ab5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available