am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo

Merge commit '3895007d523a9d5c92b971908f898f19a8c9f8ff' into kraken

* commit '3895007d523a9d5c92b971908f898f19a8c9f8ff':
  Adds back the finalize method on the replaced Paint class.