OSDN Git Service

Merge "Revert "Disable XOM in libjni_jpegutil."" am: fbbd978b24 am: 572153df83
authorIvan Lozano <ivanlozano@google.com>
Wed, 16 Jan 2019 18:03:23 +0000 (10:03 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Jan 2019 18:03:23 +0000 (10:03 -0800)
am: 51b0cc1bdd

Change-Id: I52d11954eba3ae8134b053ec09f303478590399e


Trivial merge