| commit | d6e5f0e681fd802e7975aad24af7644c0168b50c | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 17:36:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 17:36:39 2021 +0000 |
| tree | 09c5a703c6f1c30909d0f08ee8a64d3f9363b24f | |
| parent | 694541c96f5ecc743f48d7e0b03be119586c78ee [diff] | |
| parent | 36e0e2eeed8eff32685451a920c429c82b33730c [diff] |
Merge "Merge "DisplayModeDirector: proximity should not vote on doze" into sc-dev am: e8310817af am: e42c6ed8d0" into sc-v2-dev-plus-aosp am: 36e0e2eeed Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15378209 Change-Id: Ib8636656368e7a45024b8fa94af8abb1b1c4d821