tree cf456e5aec71d1a10cc9db800261c43ea83b6174
parent 8f0844ee78c1cbc81bd91818fa65e7a6e2a5b51e
parent 8802e960495e61803c18ea3dda2e30ef0a611d8f
author Daniel Sandler <dsandler@android.com> 1274977247 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274977247 -0700

am 8802e960: Defend against overlapping items in the workspace.