Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c
am: 9e608223e2
am: e12ddd0efb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268 Change-Id: I934dee17e2657d22b8b856873654cec17b1329b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: