tree 2852e52ede92b2cc9336c18ef3a22294aaf8818a
parent ce191808511599fc55f95b8a75a10cbba4b1b2ae
parent 7afa902b6cf1b63aa145ec95bc62757b4f680abd
author Adam Cohen <adamcohen@google.com> 1338339370 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338339370 -0700

am 7afa902b: Fix issue where item gets added to folder when displacing folder (issue 6576460)

* commit '7afa902b6cf1b63aa145ec95bc62757b4f680abd':
  Fix issue where item gets added to folder when displacing folder (issue 6576460)