[automerger skipped] Merge "Fix the text color in the dark theme" am: a0f6a9752b am: 44825f3bd6 am: 2d6c1b6fba -s ours
am skip reason: Merged-In I6935bce627e7b28c3a9386c1f52b3953e4d1f5c3 with SHA-1 5dcd6da37b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2450122
Change-Id: Ic6f4709f9c7819ddf8192fd123cb435e1bfcb4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: