Merge "[automerger skipped] Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout. am: bb8219d84b am: e0a4a75b35" into sc-qpr1-dev-plus-aosp am: 8567e1fa23 -s ours am: 16e9759c2c -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
bdaa4f2914