am 77b597ed: (-s ours) am 85f9f2a2: am 68942b93: (-s ours) Merge change I9733dc5d into eclair

Browse Source

Merge commit '77b597edfcd5b7eba3359644e7b2aae9803bcf1d'

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

...

This commit is contained in:

Marc Blank 2009-11-01 21:50:50 -08:00 committed by Android Git Automerger

parent f0a87489d9 77b597edfc

commit 27f6387a40

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