tree ac7927dfffdba579d7fc43768cee76c9ebcfe002
parent a143e83e1e179ee587540150989cdfd220923f96
parent b12bfbd4df985041ab0e584ef5a746328baac038
author Brad Fitzpatrick <bradfitz@android.com> 1286227715 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286227715 -0700

am b12bfbd4: am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread

Merge commit 'b12bfbd4df985041ab0e584ef5a746328baac038'

* commit 'b12bfbd4df985041ab0e584ef5a746328baac038':
  Document Bitmap.createScaledBitmap