tree 0e14ba0232d7d9ccde7879976c1c3f4fffd1ed24
parent a57aff106d30e39c782e681f8e4aa3aa612f81c3
parent 5c5cf63f78ee4787ad5619ee111097502851e12d
author Colin Cross <ccross@android.com> 1480696772 +0000
committer android-build-merger <android-build-merger@google.com> 1480696772 +0000

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

Change-Id: I5182d006d5e75d91379ce919566fd63495a8941a