[automerger skipped] [conflict] Merge "Fix the issue where resetting the refresh rates and brightness thresholds in DeviceConfig wouldn't make the system to fallback to the default values" into tm-qpr-dev am: 4e732abc0b am: 52caaf7077 -s ours

Browse Source

am skip reason: Merged-In I700d8581975fe6ac0c0db4ec800f3698ffa0c2d1 with SHA-1 c972d73d63 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22182074

Change-Id: I7450b08ae8170b7248c662861f90a9522d972590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Rupesh Bansal

2023-03-22 12:49:50 +00:00

committed by Automerger Merge Worker

parent c6c4257919 52caaf7077

commit aecea57eee

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available