tree 0a632c8bdbc99e2bb235b1dde606eb577de4b22b
parent 7af0ded9ba76e95aeb4d8ada0c444ab5fe469e82
parent 788a0ecf88bc71f8f63fc06ca7cb117a10aad42c
author Dan Willemsen <dwillemsen@google.com> 1466547591 +0000
committer android-build-merger <android-build-merger@google.com> 1466547591 +0000

Merge \\"Use a NDK-compatible libjpeg\\" am: ab5395fa88
am: 788a0ecf88

Change-Id: Iaef2ca8e22a0db5595ab63bc438e7b688249a908