OSDN Git Service

Merge "Only disable trust agents after lockout" into nyc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 11 Aug 2016 02:30:31 +0000 (02:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Aug 2016 02:30:32 +0000 (02:30 +0000)

Trivial merge