tree 50a8317d7981e7fa4e6efba548e4fc3b7f069fd4
parent 1d483601cf76eaacaa64019136d47eba98f23cc9
parent 241cdfd57ebb176ebd7b914b7f4a0da0763b6da8
author Leon Scroggins III <scroggo@google.com> 1489598370 +0000
committer android-build-merger <android-build-merger@google.com> 1489598370 +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 am: 08067c7338 am: 1e275557fa am: f4bcbe6dd5 am: a090317870
am: 241cdfd57e  -s ours

Change-Id: I7e309d2e7f80d2c5ca59a4cbbc7f6db7e1a038e4