OSDN Git Service

Merge "Disable XOM in libjni_jpegstream." am: e768dafffd am: a2aac739f2
authorIvan Lozano <ivanlozano@google.com>
Fri, 30 Nov 2018 08:45:12 +0000 (00:45 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Nov 2018 08:45:12 +0000 (00:45 -0800)
commitf618b1e83093df9c335fa89ce29d0aaad9c15b43
tree158ce0e7bc86aaa9f68146e455a20ddd33103ae5
parentf16f5fc1f6aaa44e3048d8c1a7d2fbcce6395400
parent087fedaf9db34bc85cd9e3e9f2e3921cb58654de
Merge "Disable XOM in libjni_jpegstream." am: e768dafffd am: a2aac739f2
am: 087fedaf9d

Change-Id: I38dc60ec72c6e9ac1cf98f68e700d7c95c714b69