Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 4c2242b254 am: 7f13b648df" into nyc-mr1-dev-plus-aosp

Browse Source

am: fb450bf661

* commit 'fb450bf6611339ac524ca7414f8dd0ec3377e56b':

Change-Id: I18549dd882c1dd6f2a8e39a170c1defccfc59890

...

This commit is contained in:

Robin Lee

2016-05-04 22:10:41 +00:00

committed by android-build-merger

parent fd5ac1ac7c fb450bf661

commit 8002e84b54

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