am 4735be02: am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread

Merge commit '4735be0211a996f791accc77aeb399df2258ab4c'

* commit '4735be0211a996f791accc77aeb399df2258ab4c':
  New error status for "destination file already exists".