tree c8c73b2d9e82bd138cec6b59fefdcd0f3d85eba7
parent 2dd43a115cb0d09d458fb6f69ca014ace16e02cd
parent a2aac739f23b4ea32a8029faab50b088029d1bba
author Ivan Lozano <ivanlozano@google.com> 1543567005 -0800
committer android-build-merger <android-build-merger@google.com> 1543567005 -0800

Merge "Disable XOM in libjni_jpegstream." am: e768dafffd
am: a2aac739f2

Change-Id: I48ce974b89f8a77cec17c715fc8e7294872b06cd