OSDN Git Service

am 69ed23d0: resolved conflicts for merge of 636458dd to eclair-mr2
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Nov 2009 23:04:26 +0000 (15:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Nov 2009 23:04:26 +0000 (15:04 -0800)
commitd7fbf48cea08316ab0fe2be18c950f3cb4158bbc
tree31805b1c22ca3dcd65cf5d5ad9aec3bd7d997870
parentb72e28f991b21535bfcb2ed59ead6ea9a318181c
parent69ed23d097f8d72aecb36b1b75e89ac101c4691a
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