tree 03045c94afd42a25472029b2b83fee3c60a2929b
parent bde8d7d0015f3e09a51bdb1ce2be4c060580057e
parent dea246c939e0bb6cc353ac42cc71094abff8bf74
author Elliott Hughes <enh@google.com> 1619029452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619029452 +0000

Squashed commit of the following: am: 5d41fbabdb am: dea246c939

Original change: https://android-review.googlesource.com/c/platform/external/ImageMagick/+/1676170

Change-Id: Ic2df6feab6673cf75b96cf66b069cfddbb021d70