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

Browse Source

am: 57fba6df50

* commit '57fba6df500980abec7b35019edc023e141fba98':

Change-Id: Icfb0bcb2ec831c80303bc10747c84ebed606d607

...

This commit is contained in:

Robin Lee

2016-05-25 21:38:32 +00:00

committed by android-build-merger

parent 9454788178 57fba6df50

commit 29f5ff0d7e

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