tree b25a47f3bba6fdde29111b8250e99142b72961ff
parent 61bde09c83ef1ca70d35f3b33df07e5ab2abe175
parent 6eafe5439a6380297c5da6118b9744bdfbb2d50b
author Leon Scroggins III <scroggo@google.com> 1489596839 +0000
committer android-build-merger <android-build-merger@google.com> 1489596839 +0000

Merge "Update GIFLIB to 5.1.4 DO NOT MERGE" into mnc-dev am: 279e33d754 am: 54f3d6fe60 am: 60adcd261e am: db32fc7024  -s ours
am: 6eafe5439a

Change-Id: Ia786471403eedcc7ff0b1740cc6c6a92bdb316bb