tree f2593040a40072741f2a5fb45511aa567e77f1b4
parent 603899e5a9c50bcfd2149c7932050fda0524ec6b
parent fff9ff696709e17ad73ae654e511907282bfc0fd
author Xavier Ducrohet <xav@android.com> 1254273927 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254273927 -0700

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)