From: Ivan Lozano <ivanlozano@google.com>
Date: Wed, 16 Jan 2019 17:52:30 +0000 (-0800)
Subject: Merge "Revert "Disable XOM in libjni_jpegutil.""
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Camera2.git;a=commitdiff_plain;h=572153df8369dea628c980faf97c09db9545abc4

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

Change-Id: I1770b830a1d99a22289dbba692a3454f37a3d735
---

572153df8369dea628c980faf97c09db9545abc4