tree 331c46c167c90faf0a16ba6c6e93e5f0e6d93d68
parent ac63c6d015ae7e1c9ebb0bab03719b976a583169
parent 6bfd5f379ebe80eedb1d6e229fd39592b25351dd
author Xin Li <delphij@google.com> 1599796746 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796746 +0000

[automerger skipped] Merge Android R am: 7f739a292d -s ours am: e51fbd6bef -s ours am: f4bb971b55 -s ours am: 6bfd5f379e -s ours

am skip reason: Change-Id I624489eaaf6df7bce7c65b31ace07d90f99a0c89 with SHA-1 32d48c8f61 is in history

Original change: https://android-review.googlesource.com/c/platform/system/libartpalette/+/1422531

Change-Id: I5befb1b5ee867930142e88acdcbcb7055a303876