git.osdn.net Git - android-x86/frameworks-base.git/commitdiff

author	Trevor Johns <trevorjohns@google.com>
	Mon, 11 Jan 2010 22:08:15 +0000 (14:08 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 11 Jan 2010 22:08:15 +0000 (14:08 -0800)

Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'

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

		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

frameworks/base

About OSDN

Find Software

Develop Software

Help