| commit | c7705e6b5785c27fa830b6dda05984a595547b58 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 21:09:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 21:09:20 2014 +0000 |
| tree | 35dedfc63bdf170d03f4302cbeb5f472083ec17b | |
| parent | 01db71d930114e9a02a0cf319282e17dbf18f1d7 [diff] | |
| parent | 3ebf4b23e0080b24c6376cd481a4da9d57d001a4 [diff] |
am 3ebf4b23: (-s ours) am 191c472e: am a24fc7c5: (-s ours) Merge "Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."" into klp-dev * commit '3ebf4b23e0080b24c6376cd481a4da9d57d001a4': Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."