tree 2852e52ede92b2cc9336c18ef3a22294aaf8818a
parent 4c69ebb10833b1f84d80e1ba83f3ffa7fdc4e7ab
author Adam Cohen <adamcohen@google.com> 1338335984 -0700
committer Adam Cohen <adamcohen@google.com> 1338336044 -0700

Fix issue where item gets added to folder when displacing folder (issue 6576460)

Change-Id: I6999d97a7aa35d2aa348ca350f89765abb674089