commit | 6860b955f2618dd435c62baf13c3f8cb2d29cdf5 | [log] [tgz] |
---|---|---|
author | Chavi Weingarten <chaviw@google.com> | Fri Aug 04 21:03:41 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 21:03:41 2017 +0000 |
tree | 832a67d07530845177b3dec915ba9d872e577eaa | |
parent | caefe21ae1d430a2a8147621323d8d4e11628d57 [diff] | |
parent | 768c7a9cb63323a39995f199762b06c57b286ba4 [diff] |
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev am: c36b2f0490 am: 57fe3036aa am: 768c7a9cb6 Change-Id: Ie8bf7eaa83b2396ecce98075ca800e116110bd29