diff options
| author | 2023-03-22 12:50:43 +0000 | |
|---|---|---|
| committer | 2023-03-22 12:50:43 +0000 | |
| commit | 86dde1aad9938c6ab10dba9dfe12e5abd059f168 (patch) | |
| tree | e6cd96b6cdc7ae7eb60b721d3f388c9613f50f16 /libs/androidfw/ApkParsing.cpp | |
| parent | aecea57eee90aa58d5416b8c286cc84409d10c61 (diff) | |
| parent | a7b110ff512cf28bc420ad0298f6e8cb020aa97d (diff) | |
[automerger skipped] Merge "[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" into tm-qpr-dev-plus-aosp am: a7b110ff51 -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: I20c26a74631f98f12534ffdb49141ab4c123a8b6
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