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

author	Irfan Sheriff <isheriff@google.com>
	Thu, 3 Jun 2010 18:13:21 +0000 (11:13 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 3 Jun 2010 18:13:21 +0000 (11:13 -0700)

Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
Add phase2 authentication settings

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help