| commit | 98a8258dd8759722b3aedce9297023291e33d724 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Oct 28 14:44:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 14:44:28 2014 +0000 |
| tree | e969805c47ee6d098212ae4d0ffa8c22008ea32e | |
| parent | 2381825db49718891e345eebe34b58644beab10d [diff] | |
| parent | bd6f4a818ef36764eb69ef7308eb6a9bf3740138 [diff] |
am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev * commit 'bd6f4a818ef36764eb69ef7308eb6a9bf3740138': Ensure trust agents are disabled in safe-mode