tree a1696fc12a455407a8dd583a8da1c02a3ec18861
parent 20d72bb21b9b99730924fd36ec07443c7a613b91
parent d93ebe91d196bfed67993a626d733130ba254a5a
author Matthieu Darbois <mayeut@users.noreply.github.com> 1491932147 +0000
committer android-build-merger <android-build-merger@google.com> 1491932147 +0000

Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20 am: 3e2c4b9394 am: 68ef92134c am: fdc91d98d6 am: a3c495c1ca am: f2f4cb09b7 am: 03bf2131b0 am: 147b756996  -s ours
am: d93ebe91d1

Change-Id: Iea265d74d508f53acd0110721f19069c1720221f