tree 3da85296f2b2ea27823fa16fd3389698026d5999
parent 86957661fc29ce82c3101107f95a11d1f9e59932
parent 3e2c4b9394f61fdc9aac65d2a9e288be6095ee2d
author Matthieu Darbois <mayeut@users.noreply.github.com> 1491929713 +0000
committer android-build-merger <android-build-merger@google.com> 1491929713 +0000

Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20
am: 3e2c4b9394

Change-Id: I169d0b4954ac6b235f03fd552809b924265e8190