Merge "Do not add suffix to fixed colors" into udc-dev am: 5a024a35e9 am: 77c185d8bc am: cd31059aaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23075527 Change-Id: I962ea1684fd951c63540452407266492213214ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: