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