OSDN Git Service

Only disable trust agents after lockout am: 9d6fc9246b
authorAdrian Roos <roosa@google.com>
Thu, 11 Aug 2016 02:44:42 +0000 (02:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 02:44:42 +0000 (02:44 +0000)
am: 73b2f5981e

Change-Id: Idec9662345a8ed9f75605d1b5dd39f04ef488389


Trivial merge