| commit | 36e0e2eeed8eff32685451a920c429c82b33730c | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 17:20:31 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 05 17:20:31 2021 +0000 |
| tree | faca9d1a327fa74c02106aac02617578c6d901c8 | |
| parent | fb711e0f9273e6dd3c3ce66013dfd370b7f99f04 [diff] | |
| parent | 3c377a9b7b6065ff1ef30fa35a930dd7a473fa92 [diff] |
Merge "Merge "DisplayModeDirector: proximity should not vote on doze" into sc-dev am: e8310817af am: e42c6ed8d0" into sc-v2-dev-plus-aosp