OSDN Git Service

Merge \\\\"Use a NDK-compatible libjpeg\\\\" am: ab5395fa88 am: 788a0ecf88 am: 4d0a66a358
authorDan Willemsen <dwillemsen@google.com>
Wed, 22 Jun 2016 01:23:48 +0000 (01:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:23:48 +0000 (01:23 +0000)
commit648f2de1920332b36521b9cec948d0d7a27cd340
tree6c5fe43c9502e588ba058443d8e5cc0127d49803
parent7b035c843c2a510ab52d752e405b0ffd78b12e38
parent7aa36b1f70d0ab74762e762b31196af0e671c6c4
Merge \\\\"Use a NDK-compatible libjpeg\\\\" am: ab5395fa88 am: 788a0ecf88 am: 4d0a66a358
am: 7aa36b1f70

Change-Id: I5913c30bafb188662e10088646ea845457effd15