OSDN Git Service

am 3b5cbc54: am fff9ff69: (-s ours) Merge the new Ant script rules and template from...
authorXavier Ducrohet <xav@android.com>
Wed, 30 Sep 2009 01:36:15 +0000 (18:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2009 01:36:15 +0000 (18:36 -0700)
commit085f4f29da60da8bed71b5f8ab2ba3b56cd4923e
treebbb1675b9620abe1e950799f40bbf9767da1d78a
parent4db669b91e576c9eaeb8e44af594953f85de3788
parent3b5cbc5472c96deb80d90fde815bff486fd82cba
am 3b5cbc54: am fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)

Merge commit '3b5cbc5472c96deb80d90fde815bff486fd82cba' into eclair-plus-aosp

* commit '3b5cbc5472c96deb80d90fde815bff486fd82cba':
  Merge the new Ant script rules and template from Eclair (do not merge)