| commit | 3fc9361f675e8446d4ec0aa0129a7d1f78d664b5 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 23:16:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 23:16:36 2015 +0000 |
| tree | 35eec6d4617960ed6e5f57614c596addf375227b | |
| parent | cfdee882d2633301b5fbd4c52fed3152551c8f00 [diff] | |
| parent | 0bd6407666aa4d7b0a031900b4bb1c9103eb9bc5 [diff] |
am 0bd64076: resolved conflicts for c1d15931 to stage-aosp-master * commit '0bd6407666aa4d7b0a031900b4bb1c9103eb9bc5': Enable signed-integer-overflow in httplive