git.osdn.net Git - android-x86/packages-apps-Settings.git/commitdiff

author	Michael Chan <mchan@android.com>
	Wed, 20 Jan 2010 22:35:08 +0000 (14:35 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 20 Jan 2010 22:35:08 +0000 (14:35 -0800)

Merge commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48'

* commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48':
b/2367861 Auto connect if the user turns on BT while docked.

		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help