| commit | 768c7a9cb63323a39995f199762b06c57b286ba4 | [log] [tgz] |
|---|---|---|
| author | Chavi Weingarten <chaviw@google.com> | Fri Aug 04 20:51:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 20:51:53 2017 +0000 |
| tree | d3eb039e30cf13ddd8c4bf511d758e899f7af526 | |
| parent | 41f8f8611adea12c40656448abc0867380b80697 [diff] | |
| parent | 57fe3036aa8c76a3f297648bf4401520b5a58e0f [diff] |
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev am: c36b2f0490 am: 57fe3036aa Change-Id: I0734cc082c26d21852dc62115300086c14ed708d