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

author	Wink Saville <wink@google.com>
	Wed, 2 Dec 2009 19:26:23 +0000 (11:26 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 2 Dec 2009 19:26:23 +0000 (11:26 -0800)

Merge commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2

* commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7':
Cleanup @hide and @deprecated directives.

		1	2
api/current.xml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

frameworks/base

About OSDN

Find Software

Develop Software

Help