tree 4896b6536bb7165c27e834ed07b441d99ace327e
parent f382477cc209374b58bbdadd58ae2a0c402cadc6
parent 7f1ca82861d74bccbf854e1b9e741a35773b3160
author Andrew Hsieh <andrewhsieh@google.com> 1343368473 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343368473 -0700

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

* commit '7f1ca82861d74bccbf854e1b9e741a35773b3160':
  Add prebuilts/ndk/android-ndk-r8