am 68942b93: (-s ours) Merge change I9733dc5d into eclair

Browse Source

Merge commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8' into eclair-mr2

* commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8':
  Fix folder deletion; support folder rename (#2118439) DO NOT MERGE

...

This commit is contained in:

Marc Blank 2009-10-30 11:01:13 -07:00 committed by Android Git Automerger

parent 1382dca585 68942b93a4

commit 85f9f2a262

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available