tree 367357df366799e2794ab4bacbf5ba328d50c994
parent 363054197fbad8e68fbbdd86b098e8b1386f8175
parent 572153df8369dea628c980faf97c09db9545abc4
author Ivan Lozano <ivanlozano@google.com> 1547661501 -0800
committer android-build-merger <android-build-merger@google.com> 1547661501 -0800

Merge "Revert "Disable XOM in libjni_jpegutil."" am: fbbd978b24
am: 572153df83

Change-Id: Ib45bd50cf941ec9559cda7cb59ac4f61866ad561