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)
am: 087fedaf9d

Change-Id: I38dc60ec72c6e9ac1cf98f68e700d7c95c714b69


Trivial merge