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

author	Jaikumar Ganesh <jaikumar@google.com>
	Fri, 27 May 2011 20:47:01 +0000 (13:47 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 27 May 2011 20:47:01 +0000 (13:47 -0700)

* commit 'eddb21a2ebd39900893da63749a00570f37e5038':
Changes for API of Bluetooth Discoverability. DO NOT MERGE

		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help