| commit | 732f4f72b5a284d86a409428d555f1a3f982d4c8 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Oct 28 18:01:18 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 28 18:01:18 2014 +0000 |
| tree | 20a0289e393ff0c19214be1355ee6f45ebfdbe47 | |
| parent | 6ba2ec8f93ba5cc530f448fd7f09d515cebff0e0 [diff] | |
| parent | 98a8258dd8759722b3aedce9297023291e33d724 [diff] |
am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev automerge: 98a8258 * commit '98a8258dd8759722b3aedce9297023291e33d724': Ensure trust agents are disabled in safe-mode