tree 4bbe8bc9a523466c2104aa286fd552eead6442e9
parent 845e32c6c1d3ec2d4fcdc08ad6e4e49663ec7018
parent 771288128e3408ae4b84f82b417b77ecb36e7ba0
author Daniel Xie <dxie@google.com> 1447809280 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1447809280 +0000

Merge "Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN""" into marshmallow-cts-dev