tree e47850c9f92e1b76b3217c4a25f7b80505cffae5
parent 0471ba82ca41b6a4c784f8716268bf2b652f8517
parent e551875b2d82ed2709a28e046759523cb87ba2e2
author Dianne Hackborn <hackbod@google.com> 1279257888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279257888 -0700

am e551875b: Update NDK for pre-key-dispatching changes.

Merge commit 'e551875b2d82ed2709a28e046759523cb87ba2e2' into gingerbread-plus-aosp

* commit 'e551875b2d82ed2709a28e046759523cb87ba2e2':
  Update NDK for pre-key-dispatching changes.