| commit | d7fbf48cea08316ab0fe2be18c950f3cb4158bbc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Nov 24 15:04:26 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 24 15:04:26 2009 -0800 |
| tree | 31805b1c22ca3dcd65cf5d5ad9aec3bd7d997870 | |
| parent | b72e28f991b21535bfcb2ed59ead6ea9a318181c [diff] | |
| parent | 69ed23d097f8d72aecb36b1b75e89ac101c4691a [diff] |
am 69ed23d0: resolved conflicts for merge of 636458dd to eclair-mr2 Merge commit '69ed23d097f8d72aecb36b1b75e89ac101c4691a' into eclair-mr2-plus-aosp * commit '69ed23d097f8d72aecb36b1b75e89ac101c4691a': clean step for build.prop