| commit | 982c03405e6aab4c0e1a78dccb0d937f830697cc | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 22:29:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 22:29:14 2015 +0000 |
| tree | 3422fdb5f348a02d649e45c7cb1f87c6ed60ebd2 | |
| parent | ac26e0f0b016324e1ba19c0005c5fd3066eb0aed [diff] | |
| parent | 60c356d2bf7dd7d3a47da15394ee4f954814b489 [diff] |
am 60c356d2: am 86dbc0d6: resolved conflicts for fd86dd2d to stage-aosp-master * commit '60c356d2bf7dd7d3a47da15394ee4f954814b489': Enable signed-integer-overflow in http