tree 7915e030d169d44e71bdfbb9019e75fb010c0301
parent 73ff57d02c32eef9572b6a5423428c610f9a9be9
parent a3c495c1ca5256337538e922f0bb6e15b39c3674
author Matthieu Darbois <mayeut@users.noreply.github.com> 1491930525 +0000
committer android-build-merger <android-build-merger@google.com> 1491930525 +0000

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

Change-Id: Id3f29aa5061e28161ba7ca9e1f23f89e064d229d