tree 3ea8058b16a6670d8b50765f173247ca9f8605fd
parent 78f51daa71272bc7ec65754b78af470d4efc0117
parent 774b327991dc9e1c140d929c32c87dff36695bfc
author Joe Onorato <joeo@android.com> 1276044525 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276044525 -0700

am 774b3279: Fix the folder bug.  The change that had previously fixed this got reverted somehow.