tree 331c46c167c90faf0a16ba6c6e93e5f0e6d93d68
parent 32d48c8f61dadaeb041c68c219b8415d07c79d4a
parent 7f739a292d9294fe3d680b2cb9e8245a69cba132
author Xin Li <delphij@google.com> 1599784819 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784819 +0000

[automerger skipped] Merge Android R am: 7f739a292d -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: Ie5c4cbbbe6b5d5c9997b938c39bcc7eea7d9ec40