OSDN Git Service

Merge "Disable XOM in libjni_jpegstream." am: e768dafffd
authorIvan Lozano <ivanlozano@google.com>
Fri, 30 Nov 2018 08:36:45 +0000 (00:36 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Nov 2018 08:36:45 +0000 (00:36 -0800)
commit087fedaf9db34bc85cd9e3e9f2e3921cb58654de
treec8c73b2d9e82bd138cec6b59fefdcd0f3d85eba7
parent2dd43a115cb0d09d458fb6f69ca014ace16e02cd
parenta2aac739f23b4ea32a8029faab50b088029d1bba
Merge "Disable XOM in libjni_jpegstream." am: e768dafffd
am: a2aac739f2

Change-Id: I48ce974b89f8a77cec17c715fc8e7294872b06cd