tree 2852e52ede92b2cc9336c18ef3a22294aaf8818a
parent 229a872a204c1ee259b9275696ef4f09b0a8e488
parent 725c873c0340bd92f805bc4a365214ff118b0bb0
author Adam Cohen <adamcohen@google.com> 1338339540 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338339540 -0700

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

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