diff options
| author | 2023-03-22 12:49:50 +0000 | |
|---|---|---|
| committer | 2023-03-22 12:49:50 +0000 | |
| commit | aecea57eee90aa58d5416b8c286cc84409d10c61 (patch) | |
| tree | e6cd96b6cdc7ae7eb60b721d3f388c9613f50f16 /libs/androidfw/ApkParsing.cpp | |
| parent | c6c42579197db61ac64ded7bc9d2cac50d24c1af (diff) | |
| parent | 52caaf707739c0da79a0de3fa43d7236e1ed3f93 (diff) | |
[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
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>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions