Skip to content
Commit 57fe3036 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev 

am: c36b2f04

Change-Id: Ica77a650a769c282f97056b0779def22ee0d00e1
parents 45cab063 c36b2f04
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