| commit | 16d2c267cbbd733008253ff0a95852ad5326a2b0 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Aug 11 02:44:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 02:44:47 2016 +0000 |
| tree | ef15b7c2a9f05a25b2cb90da8724979584854bc2 | |
| parent | bbf52f2e85c9d0fe43d667e4eeaab1c017dcf83e [diff] | |
| parent | dc915e418b5ce5526e6d29113f85e5afc7ded485 [diff] |
Merge "Only disable trust agents after lockout" into nyc-mr1-dev am: f6487b63a1 am: dc915e418b Change-Id: I7b498ec9fa8ef080295bffb5eda912e5d58fa525