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

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

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

Change-Id: I70866ddbb67df9c205e6252364953bdd0b0f399e