tree 2bbce0caa2906a6a87f7f1ad1dcb0c1695ebad98
parent 5930c5cafd4b0a0d322c43d47822eaa8f773eda4
parent a4738781584d58e133fc4d0f55d9b7ebcb246ff6
author Jeff Brown <jeffbrown@google.com> 1415760370 +0000
committer android-build-merger <android-build-merger@google.com> 1415760370 +0000

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.