Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev am: 00ac782f3e

am: 329bab9e1b  -s ours

Change-Id: I8c12da6716c37f68e253b504e14755ada40a9e2e
This commit is contained in:
Geoffrey Pitsch
2017-07-12 17:14:54 +00:00
committed by android-build-merger

Diff Content Not Available