| commit | 08d62965d3c7a22e10b4c1c2029dd5c1a0448282 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Thu May 29 18:39:54 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 29 18:39:54 2014 +0000 |
| tree | 88b3170db5c151123b418fcf156d5ff57808915e | |
| parent | 47df9873fbd34189b27ad9aaa0656e44baed035b [diff] | |
| parent | 13b3c8a0a63df61bb6b58f03cc02ffde043fbc99 [diff] |
Merge "changes related to moving the trust agent setting s in thne security menu"