| commit | 32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Nov 11 22:27:43 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 11 22:27:45 2014 +0000 |
| tree | bcaa623d3f45b6e98f2cbb156d19467a5ef66585 | |
| parent | da772234f6f9498bf02f31448bda16e9fcbd6bd2 [diff] | |
| parent | 5ce1cb240b13db98fbdc21e1ef069b5f9cec8d72 [diff] |
Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev