| commit | 434629fbccee712292e0335221de34d4cbfdd276 | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Tue Apr 11 18:43:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 18:43:32 2017 +0000 |
| tree | f29cc648443acb7492d326da46aabaa1ed5b2a36 | |
| parent | 069f3244e9d1ccb067877ff601a859a5950be603 [diff] | |
| parent | a3d6bfc2cc6127050ea1e88cbd78ac4ec44e00e6 [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 am: 81c5f7c382 am: e13b3512a4 am: 731d841ae5 am: 67f2ab0ec4 am: e749a90be0 am: a3d6bfc2cc Change-Id: I12d3ac04ee5708581be762d210df2fa8a72378f3