commit | dc915e418b5ce5526e6d29113f85e5afc7ded485 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Aug 11 02:38:51 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 11 02:38:51 2016 +0000 |
tree | c6df726da58a288e70034b60e3a6244755bb2773 | |
parent | 73b2f5981e85652d60de6f1ec3936b5e17d1e29b [diff] | |
parent | f6487b63a1ae674559d50456473e9d439871ec46 [diff] |
Merge "Only disable trust agents after lockout" into nyc-mr1-dev am: f6487b63a1 Change-Id: Id59329047a2857697d3611cd4179dace742364c3