tree f257864c5e57523ec86d507b1016963a0f4838f0
parent 0a5c930da681bb9d2e1fa7cd0eb89bb8214a6dbf
parent a090317870fe44d2a07a71576983b1eb38f42546
author Leon Scroggins III <scroggo@google.com> 1489598070 +0000
committer android-build-merger <android-build-merger@google.com> 1489598070 +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

Change-Id: I2232d965086f8515c45781c59560ef013d6e2cb1