tree 10307eb76788a6cda958ebb4ad2f8165794b3fae
parent dfc649502f52c38e74c86544807f3bd7b0779dbe
parent dd2f703e28f51741fd0d13b7ab86200b14c512cf
author Mahaver Chopra <mahaver@google.com> 1445948146 +0000
committer android-build-merger <android-build-merger@google.com> 1445948146 +0000

Merge "CTS: DO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev
am: dd2f703e28

* commit 'dd2f703e28f51741fd0d13b7ab86200b14c512cf':
  CTS: DO tests for DISALLOW_CONFIG_VPN