tree 79551c623a37cd052baeb4d11605c1b9e78fc1e3
parent cc146264097ad99062121e0518a82d864fae1c70
parent 2955bbf1c6a6871cc280665e689f5db2cc453a2f
author Cristy <mikayla-grace@urban-warrior.org> 1569991827 -0700
committer android-build-merger <android-build-merger@google.com> 1569991827 -0700

[automerger skipped] https://github.com/ImageMagick/ImageMagick/issues/1554 am: 57879bb058 am: 82d61aec54 am: 964ca40a59 am: a009aae360 -s ours
am: 2955bbf1c6 -s ours
am skip reason: change_id I84d6258cd854be68c752b62964fd746fc6b38fc3 with SHA1 1475a365af is in history

Change-Id: I28f8d0ba7a3a4432818e8abb2f2403d6d6ecc309