tree f80189072577fb0bc21516ec164c68ee98366014
parent aeaca56b02fe146c12b57e0a987aef5a22ddcd25
parent 4c86b6ec1a905e46f2a575ac0851ec5f153a4acf
author Ying Wang <wangying@google.com> 1344971460 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344971460 -0700

am 4c86b6ec: (-s ours) Adopt the new prebuilts/ndk/<number> paths.

* commit '4c86b6ec1a905e46f2a575ac0851ec5f153a4acf':
  Adopt the new prebuilts/ndk/<number> paths.