| commit | 60c356d2bf7dd7d3a47da15394ee4f954814b489 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 21:19:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 21:19:11 2015 +0000 |
| tree | a10383a264b5dab3112d9c46652a9a0ec719e26c | |
| parent | 331f8ee538b5e49f416000c54dada8322ca7e8ee [diff] | |
| parent | 86dbc0d62126868368b35a6127a7317248925247 [diff] |
am 86dbc0d6: resolved conflicts for fd86dd2d to stage-aosp-master * commit '86dbc0d62126868368b35a6127a7317248925247': Enable signed-integer-overflow in http