tree 8a3597aa7fa28944c8ebe6cf6e8ca3401546329b
parent 9fd8aaca4762f0852c016af34db696eebd4bfc92
parent 2e9dac4b0584bce238fed60ba2801af3e7a2c003
author Robert Ly <robertly@google.com> 1334093168 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334093168 -0700

am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108