tree 4ae47bc23ff20671b7a33d251369fad6c2320817
parent 8157b85487ed7eda408e289b9cd1ee6159490612
parent c21c413567142b50fd76f1b5ad16c8b61bcc6bdd
author Treehugger Robot <treehugger-gerrit@google.com> 1614360408 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614360408 +0000

[automerger skipped] Merge "Fix bug on High Contrast Text : where DarkTheme is enabled && ForceDarkAllowed is true." am: ed08871382 am: 057450645c am: c21c413567 -s ours

am skip reason: Change-Id Icf0048ef8d55c2e29676944c24c2050f531616d5 with SHA-1 0c15baeb4d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifff414f6fffd3aff8813211fe69e9be720f225d6