| commit | a2856c4e207fdfdcb76100ff61962660d6b2c82e | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 20:58:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 20:58:14 2014 +0000 |
| tree | 35dedfc63bdf170d03f4302cbeb5f472083ec17b | |
| parent | 07ba62f9d6e6ca754124d5804f5a997177ea951d [diff] | |
| parent | e57d26c867717b72cd057fc4372bba5f39e6f59f [diff] |
am e57d26c8: (-s ours) am 81bada14: am 90fd3c91: (-s ours) Merge "Revert "DO NOT MERGE: Modify the pseudo-header checksum functions."" into klp-dev * commit 'e57d26c867717b72cd057fc4372bba5f39e6f59f': Revert "DO NOT MERGE: Modify the pseudo-header checksum functions."