Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: fb0faa494e am: e5bbf42d23" into nyc-mr1-dev-plus-aosp

Browse Source

am: 06864ec342

* commit '06864ec34283ef08024b4e7ebecfaa68c00cbd42':

Change-Id: I18549dd882c1dd6f2a8e39a170c1defccfc59890

...

This commit is contained in:

Robin Lee

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

committed by android-build-merger

parent 67372ea20d 06864ec342

commit 64d5c5e8a1

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