| commit | 0d703e4a35d52c1d8900cd6142f84a0d118b8014 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Jun 26 00:13:04 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 24 06:38:52 2014 +0000 |
| tree | 7ae84c01f21a128831b4246e07dc526a5e576af6 | |
| parent | dded065c8659f3622ec309359abee822ba919a77 [diff] | |
| parent | ef1de65117e8361cbeb188309dbb1a7953350c2a [diff] |
Merge "Trust Agents: Disable until next unlock if device is locked by DPM"