commit | 831761f84ef34068526fc294bcd7e5bb799ccb1b | [log] [tgz] |
---|---|---|
author | Philip P. Moltmann <moltmann@google.com> | Tue Apr 11 17:17:52 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 17:17:52 2017 +0000 |
tree | a4c08d2f49975207e7be1ec11ad9dd90a584cb3f | |
parent | 147b75699681580cd1ba7fab7ea5251a4e84adde [diff] | |
parent | 37654da1d3935aec3d4589f63b3cb06c497c449a [diff] |
Merge "Backport 940100c28ae28931722290794889cf84a92c5f6f from libopenjpeg20" into lmp-dev am: 57d92ccd81 am: 546760ac17 am: 10cae91e29 am: b44828b6cc am: 0ee97a4b56 am: 37654da1d3 Change-Id: Ife353743c6283e45e282771e517ec7b29dca1794