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