Skip to content
Commit 41f8f861 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 

am: 3477c314

Change-Id: Ia1370c3b043a70884b1308a6ca1893d056795bfe
parents 4b7fb86e 3477c314
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