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

author	Dirk Dougherty <ddougherty@google.com>
	Mon, 23 Nov 2009 21:55:50 +0000 (13:55 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 23 Nov 2009 21:55:50 +0000 (13:55 -0800)

Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2

* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.

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

Simple merge

frameworks/base

About OSDN

Find Software

Develop Software

Help