| commit | 73a177a26ccae95235606892b9290ebfb199d689 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Jun 21 22:19:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:19:33 2016 +0000 |
| tree | aa9a3fd505efb3357db94638b33f2ff4ce8948da | |
| parent | 10900ad19791496a6c0db5f6449943d1a5a7aee7 [diff] | |
| parent | 2da3ecb5c6e8e95f27316dd2b8a9443101d17789 [diff] |
Merge \\"Use a NDK-compatible libjpeg\\" am: 0f763c5d10 am: 2da3ecb5c6 Change-Id: I99a5e3a21af2ad1de6e919f2bddb7cdea10560a7