tree 4d5681e965225422ca8d44f2e63d03c3a9e3334c
parent d91ac162d196a232d3cec58a8486384eaa8847c3
parent d48e0382c3db1827ccb79fe912d271d426dd46ad
author Dirk Dougherty <ddougherty@google.com> 1273811671 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273811671 -0700

am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo

Merge commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken

* commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad':
  Doc change: adjustments for ndk feature description