OSDN Git Service

[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying...
authorVarun Anand <vaanand@google.com>
Fri, 22 Mar 2019 18:45:16 +0000 (11:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Mar 2019 18:45:16 +0000 (11:45 -0700)
am: 9f98789d3f -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history

Change-Id: I98242257e569eeac747c0328dfa6381e49e7c0b0


Trivial merge