| commit | 5384357c7ba9d369cf6264a03bd3f9240a76ac76 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 23:11:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 23:11:50 2014 +0000 |
| tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
| parent | 1cc2429b9929c94d15cef48c3f46bd09772c0de2 [diff] | |
| parent | 35c9ff942a2a8b85ac5d2ff97c7d4ff30234dd80 [diff] |
am 35c9ff94: resolved conflicts for merge of c87d5c75 to klp-modular-dev-plus-aosp * commit '35c9ff942a2a8b85ac5d2ff97c7d4ff30234dd80': DO NOT MERGE: Fix up checksums instead of recalculating them.