tree 795c549e968c685105ec74b4d907a88842aae9b6
parent 5755d6ad3913be0a9dcd39927dca481e094fc2c9
parent b4b64ad6025a6ac714f3358baf32fee36950c232
author Varun Anand <vaanand@google.com> 1550693660 -0800
committer android-build-merger <android-build-merger@google.com> 1550693660 -0800

[automerger skipped] Merge "Update VPN capabilities when its underlying network set is null." into pi-dev
am: b4b64ad602 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history

Change-Id: I8cdd422bf5686c707d60137eccb4e1caae8194a3