tree ef15b7c2a9f05a25b2cb90da8724979584854bc2
parent e329adfcf5d3d93994ccacf7ca2f17b155cf1499
parent 73b2f5981e85652d60de6f1ec3936b5e17d1e29b
author Adrian Roos <roosa@google.com> 1470883482 +0000
committer android-build-merger <android-build-merger@google.com> 1470883482 +0000

Only disable trust agents after lockout am: 9d6fc9246b
am: 73b2f5981e

Change-Id: Idec9662345a8ed9f75605d1b5dd39f04ef488389