tree aa2a1c0aebe1171eff5650971b267f7e48ded0f4
parent 98994c4a83e86e2444eb928a9bd3392f1f31f0cd
parent 596c0e6dbbe80f016339ad5592b1b79fdef75ad7
author Daniel Sandler <dsandler@android.com> 1275543699 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275543699 -0700

am 596c0e6d: Don\'t perform collision checks for items in folders.