Merge "Fixes a crash ColorScheme#toString" into tm-dev am: 25aff0ecd9 am: 093e9bc6fb am: 7981f60d05 am: 4816344f02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18800901 Change-Id: Ib785b73a1a699e053b6433ce0f851ac46927735c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: