tree 5b35b5372f39e3c663e9d3b730e999a232d1d569
parent 3215afaee4fdf5d8247e906bcf5fec81b07bf81a
parent 02d92477d5bd290eb8cd1ef7e13e903520ebba05
author The Android Open Source Project <initial-contribution@android.com> 1273184163 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273184163 -0700

am 02d92477: Merge commit \'goog/readonly-korg-master\' into HEAD

Merge commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05' into kraken

* commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05':
  Update sdk.atree with new ant rules location.