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

author	Amith Yamasani <yamasani@google.com>
	Tue, 5 Jun 2012 16:21:32 +0000 (09:21 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 5 Jun 2012 16:21:32 +0000 (09:21 -0700)

* commit '227edcf61abaf91001d9061537d66e0aad64a4ee':
Account types at toplevel of Settings

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help