Skip to content
Commit 32f7a6d8 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev

parents da772234 5ce1cb24
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment