| commit | f7570b7cf996161ea10f66dbc0f4960e03c481f1 | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Thu Aug 27 10:46:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:46:40 2015 +0000 |
| tree | db6fc94f150824ae88b1823d74392880f1631753 | |
| parent | 6448c46716316de42af17a49d9fbf2fd8865e033 [diff] | |
| parent | 76bfd10a3e2fc5f027b5fb634f2447dfb962c9bb [diff] |
am 76bfd10a: (-s ours) am 1bd8dec0: Merge "Fix breakage from giflib update" * commit '76bfd10a3e2fc5f027b5fb634f2447dfb962c9bb':