tree 1da85f32dbecd5d62e79d5a68d57f0398547714b
parent ee8cf6652af4d24879734c2fe6939d0a4ff81b0a
parent 0feef91d2b85d22c79f96952fc16df06995937ed
author Dirk Dougherty <ddougherty@google.com> 1273675797 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273675797 -0700

am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo

Merge commit '8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp

* commit '8acb68e9aae7f6766b88440ede6598da63db9fdd':
  Doc Change: Docs for NDK r4.