| commit | 41f8f8611adea12c40656448abc0867380b80697 | [log] [tgz] |
|---|---|---|
| author | Chavi Weingarten <chaviw@google.com> | Fri Aug 04 20:46:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 20:46:51 2017 +0000 |
| tree | d3eb039e30cf13ddd8c4bf511d758e899f7af526 | |
| parent | 4b7fb86e426a636c89cad6af7e855e53a2ec68b9 [diff] | |
| parent | 3477c31485cbcd7b2bad0e2f5f1f55d43dc59a1a [diff] |
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev am: c36b2f0490 am: 3477c31485 Change-Id: Ia1370c3b043a70884b1308a6ca1893d056795bfe