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

author	Nick Pelly <npelly@google.com>
	Wed, 29 Sep 2010 05:34:42 +0000 (22:34 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 29 Sep 2010 05:34:42 +0000 (22:34 -0700)

Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp

* commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4':
Add NFC checkbox to Settings app.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help