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

author	Amith Yamasani <yamasani@google.com>
	Wed, 2 Dec 2009 23:46:53 +0000 (15:46 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 2 Dec 2009 23:46:53 +0000 (15:46 -0800)

Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-plus-aosp

* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
Feature #2296147 Settings for Car/Desk Dock on certain devices

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help