tree 4b1bb6fd3fd3ccf73f7f858aa7fe100978a50fc2
parent 33ab015a5c1875cafca002338d25f404da8dfe11
parent 7918f1e655c42c59101cdc177e56a0c59a9038c1
author Daniel Xie <dxie@google.com> 1455836091 +0000
committer android-build-merger <android-build-merger@google.com> 1455836091 +0000

Merge "Require device admin feature for device admin CTSV tests." into marshmallow-cts-dev
am: 7918f1e655

* commit '7918f1e655c42c59101cdc177e56a0c59a9038c1':
  Require device admin feature for device admin CTSV tests.