| commit | 70170261cbd966501a673ba5548dcab823037cfb | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Nov 12 02:46:10 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 12 02:46:10 2014 +0000 |
| tree | 2bbce0caa2906a6a87f7f1ad1dcb0c1695ebad98 | |
| parent | 5930c5cafd4b0a0d322c43d47822eaa8f773eda4 [diff] | |
| parent | a4738781584d58e133fc4d0f55d9b7ebcb246ff6 [diff] |
am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev automerge: c1275e7 automerge: a473878 * commit 'a4738781584d58e133fc4d0f55d9b7ebcb246ff6': Move device admin max screen off timeout to internal interface.