am fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit 'fff9ff696709e17ad73ae654e511907282bfc0fd' into eclair * commit 'fff9ff696709e17ad73ae654e511907282bfc0fd': Merge the new Ant script rules and template from Eclair (do not merge)
This commit is contained in: