| commit | 690d0cfdd0926d1238baed4c7a90ea9e6c326723 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Mar 08 19:54:10 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 08 19:54:11 2017 +0000 |
| tree | 2b8b1acae209b4ee57fc3f0eceb80eea74cb88a7 | |
| parent | be167b088da540bfed9c9daa1478e76dc02d6725 [diff] | |
| parent | 73c52f291d3a0a6230e18911fc8007375bd4c34b [diff] |
Merge "SecuritySubSettings: Show trust agent label on lock timeout setting"