tree a5b3aee151fa3f05400eb93b77bc162014db94d9
parent a97ccc02e18cd21c9cf1caaf63c4a680bf3c6f0a
parent 94db0238a3b6cba3cbf0e037af74e898a4741204
author Joseph Wen <josephwen@google.com> 1284111550 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284111550 -0700

am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread

Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204'

* commit '94db0238a3b6cba3cbf0e037af74e898a4741204':
  Fix bug in JNI BitmapFactory