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

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

Change-Id: I77b3beec112d482e6baa8795a72e1acf2bda8cbe