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

author	Roy West <rwest@google.com>
	Fri, 22 Oct 2010 00:53:37 +0000 (17:53 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 22 Oct 2010 00:53:37 +0000 (17:53 -0700)

Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp

* commit '69827524365ae448d19b2089c46534e925cc2bfd':
Try to fix bug3119318 without breaking the build this time

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help