tree a1696fc12a455407a8dd583a8da1c02a3ec18861
parent d93ebe91d196bfed67993a626d733130ba254a5a
parent 831761f84ef34068526fc294bcd7e5bb799ccb1b
author Philip P. Moltmann <moltmann@google.com> 1491931889 +0000
committer android-build-merger <android-build-merger@google.com> 1491931889 +0000

Merge "Backport 940100c28ae28931722290794889cf84a92c5f6f from libopenjpeg20" into lmp-dev am: 57d92ccd81 am: 546760ac17 am: 10cae91e29 am: b44828b6cc am: 0ee97a4b56 am: 37654da1d3
am: 831761f84e

Change-Id: I4d5c245bd3e3c3d870811e2c549fed3acf23a4cf