| commit | 6ecc81155cfde5cf07d0111b3a2532be1fac4139 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 23:11:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 23:11:52 2014 +0000 |
| tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
| parent | dfe7ff80e18e84cf7437e1d600103e10578c3dec [diff] | |
| parent | c641fffcd3a69416fa82933ac16d11e9a687dc26 [diff] |
am c641fffc: resolved conflicts for merge of e50d5767 to klp-modular-dev-plus-aosp * commit 'c641fffcd3a69416fa82933ac16d11e9a687dc26': DO NOT MERGE: Modify the pseudo-header checksum functions.