tree 7643f6b1d39a5ba3d372fb0bffd3a82ca0c741b0
parent 29514750e8152b3065df94ea6247216e229d78b5
parent 045cfb101119e5288bfcfbc433834f95a1b07a94
author Mahaver Chopra <mahaver@google.com> 1445948319 +0000
committer android-build-merger <android-build-merger@google.com> 1445948319 +0000

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

* commit '045cfb101119e5288bfcfbc433834f95a1b07a94':
  CTS: DO tests for DISALLOW_CONFIG_VPN