Commits
Jeff Brown authored and android-build-merger committed 70170261cbdM
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.
Showing diff to5930c5cafd4