tree 26fba074e261893c43bdfb5d02e44190ffaa7792
parent c62b7f0f8d089f9460581338e3cdf19795237194
parent bbf52f2e85c9d0fe43d667e4eeaab1c017dcf83e
author Adrian Roos <roosa@google.com> 1470883867 +0000
committer android-build-merger <android-build-merger@google.com> 1470883867 +0000

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

Change-Id: I4606854b24313cc8231aaa0ce3ea33ea909f68b0