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