| commit | 81c5f7c3828f7687d720b25c698ac7824ce4fd0f | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Tue Apr 11 17:35:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 17:35:56 2017 +0000 |
| tree | a1696fc12a455407a8dd583a8da1c02a3ec18861 | |
| parent | 991b2d236a400233af27fa34a8921cabeb31fd4e [diff] | |
| parent | ebaeb6a494b6bee8c9245f85bad23b31fe170af9 [diff] |
Merge "Backport 940100c28ae28931722290794889cf84a92c5f6f from libopenjpeg20" into lmp-dev am: 57d92ccd81 am: 546760ac17 am: 10cae91e29 am: b44828b6cc am: 0ee97a4b56 am: 37654da1d3 am: 831761f84e am: ebaeb6a494 Change-Id: I7eafdb40cc5580419e7061ed7746f6c024fe068a