am 246b7d91: DO NOT MERGE Fix setjmp warning in qpTestLog PNG compression code
authorPyry Haulos <phaulos@google.com>
Tue, 18 Nov 2014 17:27:51 +0000 (17:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Nov 2014 17:27:51 +0000 (17:27 +0000)
* commit '246b7d9155dd3fa10c7e7129e41ec3949194f86b':
  DO NOT MERGE Fix setjmp warning in qpTestLog PNG compression code


Trivial merge