| commit | c1275e72eceb171544aaf517f0cb6e3d1cbd9e08 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Nov 11 22:48:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 22:48:23 2014 +0000 |
| tree | 8768b7e5b33c4287ab6890a842b63b52e8e6fd50 | |
| parent | 1e2e05bf8cb1445f9e431ca54837bb01f762d9e6 [diff] | |
| parent | 32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9 [diff] |
am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev * commit '32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9': Move device admin max screen off timeout to internal interface.