| commit | c321435a9615758e3b8787fee2e2298f933ff40d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Nov 24 15:09:53 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 24 15:09:53 2009 -0800 |
| tree | 38fffcd47af76a179d1d6f7af6e71a4c7193f32e | |
| parent | b38a9f2be61af47457675df48aea21ee2ca703f7 [diff] | |
| parent | d7fbf48cea08316ab0fe2be18c950f3cb4158bbc [diff] |
am d7fbf48c: am 69ed23d0: resolved conflicts for merge of 636458dd to eclair-mr2 Merge commit 'd7fbf48cea08316ab0fe2be18c950f3cb4158bbc' * commit 'd7fbf48cea08316ab0fe2be18c950f3cb4158bbc': clean step for build.prop