tree a4c08d2f49975207e7be1ec11ad9dd90a584cb3f
parent a3c495c1ca5256337538e922f0bb6e15b39c3674
parent 10cae91e29b6c79ba5e4bb84372921b38dee5b44
author Philip P. Moltmann <moltmann@google.com> 1491930232 +0000
committer android-build-merger <android-build-merger@google.com> 1491930232 +0000

Merge "Backport 940100c28ae28931722290794889cf84a92c5f6f from libopenjpeg20" into lmp-dev am: 57d92ccd81 am: 546760ac17
am: 10cae91e29

Change-Id: Idd0ac53795d14e75b9770e97f2dac76b6c9fa3f0