| commit | 01f875f9be80ba6e0b4cebc847ed23fe0112d837 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 20:28:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 20:28:25 2014 +0000 |
| tree | 35dedfc63bdf170d03f4302cbeb5f472083ec17b | |
| parent | caeed6fcfcd4c281603b0ac3b51185afeb2dac71 [diff] | |
| parent | b1f85476dd906655c085a0d6b5db75c264822386 [diff] |
am b1f85476: (-s ours) am 12123e65: am 489e1089: (-s ours) DO NOT MERGE: Fix up checksums instead of recalculating them. * commit 'b1f85476dd906655c085a0d6b5db75c264822386': DO NOT MERGE: Fix up checksums instead of recalculating them.