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

author	Jaikumar Ganesh <jaikumar@google.com>
	Tue, 21 Jun 2011 20:24:22 +0000 (13:24 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 21 Jun 2011 20:24:22 +0000 (13:24 -0700)

* commit '7ab66973a973b9d23c411bf1c6631fa93c4903bf':
DO NOT MERGE Show user dialog for BT.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help