Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 4fb4490dfb am: 624febb525" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-25 21:29:54 +00:00
committed by Android (Google) Code Review

Diff Content Not Available