OSDN Git Service

Merge "Revert "Disable XOM in libjni_jpegstream."" am: a12f92690e am: 48e33926e8
authorIvan Lozano <ivanlozano@google.com>
Wed, 16 Jan 2019 18:03:54 +0000 (10:03 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Jan 2019 18:03:54 +0000 (10:03 -0800)
am: ff32eaeaf0

Change-Id: If380f922f3b6bb1f0be0d53ab64036e267581627


Trivial merge