OSDN Git Service

am d7fbf48c: am 69ed23d0: resolved conflicts for merge of 636458dd to eclair-mr2
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Nov 2009 23:09:53 +0000 (15:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Nov 2009 23:09:53 +0000 (15:09 -0800)
Merge commit 'd7fbf48cea08316ab0fe2be18c950f3cb4158bbc'

* commit 'd7fbf48cea08316ab0fe2be18c950f3cb4158bbc':
  clean step for build.prop

1  2 
cleanspec.mk

diff --cc cleanspec.mk
Simple merge