tree db6fc94f150824ae88b1823d74392880f1631753
parent 4f54368fdbfb5f868070091a891c98303e9b114e
parent 1bd8dec0b9cf4d77e33cd535eb1f2c76448b505b
author Derek Sollenberger <djsollen@google.com> 1440428389 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440428389 +0000

am 1bd8dec0: Merge "Fix breakage from giflib update"

* commit '1bd8dec0b9cf4d77e33cd535eb1f2c76448b505b':
  Fix breakage from giflib update