am 31b5d4b9: am 45e5ca1c: Merge change I0deb0117 into eclair-mr2

Merge commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294'

* commit '31b5d4b98e8079a1d97aff8dc3e0824b95d1e294':
  NDK header for accessing pixels of a java bitmap