tree cdf7ea44cd8ace683339cce8eb17e51252ba9a35
parent f9f56ebf74d7951ac44b57823772bcb95ef11cf8
parent 0f763c5d10b0aa5a39ab11094b3c892102a3cba4
author Dan Willemsen <dwillemsen@google.com> 1466547260 +0000
committer android-build-merger <android-build-merger@google.com> 1466547260 +0000

Merge \"Use a NDK-compatible libjpeg\"
am: 0f763c5d10

Change-Id: Ie43896a8e9ff28542a363caf0d5c74092b5f9145