tree f6e3e0c83b3fbca5f0c237cbdce1996e907a6ffd
parent 6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9
parent 50a3977c619be113bb35fb7fd53874effad6dbe4
author Trevor Johns <trevorjohns@google.com> 1263247555 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263247555 -0800

am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair

Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.