diff options
| author | 2022-08-08 19:02:01 +0000 | |
|---|---|---|
| committer | 2022-08-31 22:26:07 +0000 | |
| commit | 843cd5ea892a030fe6c18617c9d468b34c2b1bd5 (patch) | |
| tree | 2bf44082192821f13c35e9604f8db921caf79442 /libs/androidfw/StringPool.cpp | |
| parent | 7b21fb6b4a04e1a8051144e72bdfdc1e67a0b1f7 (diff) | |
[DO NOT MERGE] Revert "[DO NOT MERGE]Revert "Migrate KeyguardClockSwitch to new..."
Revert "[DO NOT MERGE]Revert "Expose the clock version of google..."
Revert "[DO NOT MERGE]Revert "Changes to SystemUIGoogle to suppo..."
Revert submission 19508951-revert-19451291-cherrypick-clock_migration-tvip0m638i-BKWSUCNJAV
Reason for revert: Double Revert w/ fixes
Reverted Changes:
Iccd8d2e19:[DO NOT MERGE]Revert "Add clock version of google-...
I432d3d814:[DO NOT MERGE]Revert "Migrate KeyguardClockSwitch ...
Ifd0aa59df:[DO NOT MERGE]Revert "Expose the clock version of ...
I9a6ca6349:[DO NOT MERGE]Revert "Changes to SystemUIGoogle to...
To minimize merge issues, this topic consists of just cherry-picks from
master. Fixes for bugs are provided as downstream commits and will be
merged back to master as those bugs exist there as well. The commits
in this topic weren't tested in isolation beyond automated testing.
Additionally, I've updated the ktfmt exclude list to include new files
from this cherry-pick instead of reformatting those files.
Test: Screenshot test and manually validated each downstream fix mostly by
comparing reference images from known good builds to test builds.
Change-Id: Iff1d0ee8c6d09c77185be1ca5bbbe1aa5870e0c7
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions