tree 4b14c65374ee1db8c8d6911fb1b90a7588e08d4a
parent 7de900f3629e53e1a05b8d5854cf0164446346ae
parent eb6e22f29ded58e7e51702c34878fd01e20ff802
author Brad Fitzpatrick <bradfitz@android.com> 1286220238 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286220238 -0700

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

Merge commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802' into gingerbread-plus-aosp

* commit 'eb6e22f29ded58e7e51702c34878fd01e20ff802':
  Document Bitmap.createScaledBitmap