Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: 30c63961dd" into nyc-mr1-dev-plus-aosp

Browse Source

am: 71363f6c78

* commit '71363f6c7857b893c34ac016e7675a1e002e7316':

Change-Id: Icfb0bcb2ec831c80303bc10747c84ebed606d607

...

This commit is contained in:

Robin Lee

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

committed by android-build-merger

parent 67580e5874 71363f6c78

commit 024296778a

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