| commit | f6487b63a1ae674559d50456473e9d439871ec46 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Aug 11 02:30:31 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 11 02:30:32 2016 +0000 |
| tree | e12f773a49acdaace58741856016f60e27621385 | |
| parent | 927db408a2857b209b1a313ac9208a7892956836 [diff] | |
| parent | 9d6fc9246ba0b726872a6a8dabe6c334292c3a10 [diff] |
Merge "Only disable trust agents after lockout" into nyc-mr1-dev