tree 0e14ba0232d7d9ccde7879976c1c3f4fffd1ed24
parent a57aff106d30e39c782e681f8e4aa3aa612f81c3
parent 34bd52e5beabd8a558df94c21b776be5ef98db15
author Colin Cross <ccross@android.com> 1480695871 +0000
committer android-build-merger <android-build-merger@google.com> 1480695871 +0000

Merge "Convert giflib to Android.bp" am: c549daef5e
am: 34bd52e5be

Change-Id: Ie0d542fd6a48be04644a443e2e3221f3a75cd2b3