commit | 4d0a66a358c32bb78b601084baf262ee722c436b | [log] [tgz] |
---|---|---|
author | Dan Willemsen <dwillemsen@google.com> | Tue Jun 21 22:19:51 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:19:51 2016 +0000 |
tree | 0a632c8bdbc99e2bb235b1dde606eb577de4b22b | |
parent | 7af0ded9ba76e95aeb4d8ada0c444ab5fe469e82 [diff] | |
parent | 788a0ecf88bc71f8f63fc06ca7cb117a10aad42c [diff] |
Merge \\"Use a NDK-compatible libjpeg\\" am: ab5395fa88 am: 788a0ecf88 Change-Id: Iaef2ca8e22a0db5595ab63bc438e7b688249a908