tree 3b264aff637bcd152b2b66ed9ac501c77dc62ef1
parent cd89a9be3397dfc6416835b3f1cbe37b3e5b605b
parent 9df375719f7d4995eedbda800d50b735983c7401
author Andrew Hsieh <andrewhsieh@google.com> 1343367286 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343367286 -0700

am 9df37571: (-s ours) Merge "Add prebuilts/ndk/android-ndk-r8"

* commit '9df375719f7d4995eedbda800d50b735983c7401':
  Add prebuilts/ndk/android-ndk-r8