diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-26 00:13:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-24 06:38:52 +0000 |
| commit | 0d703e4a35d52c1d8900cd6142f84a0d118b8014 (patch) | |
| tree | 7ae84c01f21a128831b4246e07dc526a5e576af6 /rs | |
| parent | dded065c8659f3622ec309359abee822ba919a77 (diff) | |
| parent | ef1de65117e8361cbeb188309dbb1a7953350c2a (diff) | |
| download | frameworks_base-0d703e4a35d52c1d8900cd6142f84a0d118b8014.zip frameworks_base-0d703e4a35d52c1d8900cd6142f84a0d118b8014.tar.gz frameworks_base-0d703e4a35d52c1d8900cd6142f84a0d118b8014.tar.bz2 | |
Merge "Trust Agents: Disable until next unlock if device is locked by DPM"
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions