tree ac38ae6576976881274f587cc118b98fdad128c1
parent ff660190e28ee2476fa0fda3e1a67777f599e9c5
parent c36b2f0490dc1d00a5e63f7e5d352a8471108b67
author Chavi Weingarten <chaviw@google.com> 1501879212 +0000
committer android-build-merger <android-build-merger@google.com> 1501879212 +0000

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

Change-Id: If0b75ee69bdb7c1668e87d40cb0c1d7d72feff58