tree 10723ea748b1208a4b8ddc9237a4f33173048659
parent 471e2c285e5d58c5b2a5b1044b6aa90abbab6351
parent 959da569e0962a95bafb0a3556234ff3ecd9f714
author Ivan Lozano <ivanlozano@google.com> 1543566964 -0800
committer android-build-merger <android-build-merger@google.com> 1543566964 -0800

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

Change-Id: Ia126e654f64ab8f73639e3a8abf6066b1d39c4df