am 085f4f29: (-s ours) am 3b5cbc54: am fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '085f4f29da60da8bed71b5f8ab2ba3b56cd4923e' * commit '085f4f29da60da8bed71b5f8ab2ba3b56cd4923e': Merge the new Ant script rules and template from Eclair (do not merge)
This commit is contained in: