tree 331c46c167c90faf0a16ba6c6e93e5f0e6d93d68
parent 102d5e87144dca7787441e08f617c9bee7a241d5
parent 679e33205103fd74d8285d83377ceaac488db59b
author Xin Li <delphij@google.com> 1598998202 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998202 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 32d48c8f61 -s ours am: dca182d958 -s ours am: 679e332051 -s ours

am skip reason: Change-Id I21aaf06e2e97afaae2492a54faf969c1d7d1d014 with SHA-1 5f7908063f is in history

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

Change-Id: I34822840d4a481b851b5e949ff58188535e89a62