tree ccdf05a72eb2bce24138d88a6b8d5ea4f54fa47b
parent d3ce2546e854b1a7b9f2b633823fd7d5e648cea7
parent 24fc7e20e4b2620098bd3e284ced9b1812856580
author Ivan Lozano <ivanlozano@google.com> 1543567366 -0800
committer android-build-merger <android-build-merger@google.com> 1543567366 -0800

Merge "Disable XOM in libjni_jpegutil." am: 8976366652 am: 959da569e0
am: 24fc7e20e4

Change-Id: I5fe950d12e19fc9e581a780b1dda42cb52dfc415