tree e5d3aa5cf52f966eae9c0e2a0c5b8aeb4719ecd9
parent 6d83685d5bf146835977e56017f8c485932e8047
parent 45e5ca1c7047b20d36bd31b30b7d2a4786baab0f
author Mike Reed <reed@google.com> 1260195531 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260195531 -0800

am 45e5ca1c: Merge change I0deb0117 into eclair-mr2

Merge commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f' into eclair-mr2-plus-aosp

* commit '45e5ca1c7047b20d36bd31b30b7d2a4786baab0f':
  NDK header for accessing pixels of a java bitmap