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)
commitf6487b63a1ae674559d50456473e9d439871ec46
treee12f773a49acdaace58741856016f60e27621385
parent927db408a2857b209b1a313ac9208a7892956836
parent9d6fc9246ba0b726872a6a8dabe6c334292c3a10
Merge "Only disable trust agents after lockout" into nyc-mr1-dev