tree 2a8dc8f922fc6958c85712d1338c651416cf3304
parent fd535d1acb2fe355f83f74a68a58ef55f218dca1
parent 1ff4f596bfe608b26656f1e854f1a5504877bdaa
author Android (Google) Code Review <android-gerrit@google.com> 1248541827 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248541827 -0700

am 1ff4f596: Merge change 8502 into donut

Merge commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa'

* commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa':
  Rename ndk/build/platforms/android-1.5 into android-3 to match API levels