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)
This commit is contained in: