tree 7915e030d169d44e71bdfbb9019e75fb010c0301
parent 5022fbe8a4ab6f58278e7ccefd765f339488aed5
parent fdc91d98d6668009f6de6f55bf60406d2154dc6a
author Matthieu Darbois <mayeut@users.noreply.github.com> 1491930225 +0000
committer android-build-merger <android-build-merger@google.com> 1491930225 +0000

Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20 am: 3e2c4b9394 am: 68ef92134c
am: fdc91d98d6

Change-Id: Id7b2e53de5cfd9fdfc834f8e8e0bc4eca1a7ac14