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

author	Dianne Hackborn <hackbod@google.com>
	Sat, 16 Oct 2010 23:55:30 +0000 (16:55 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 16 Oct 2010 23:55:30 +0000 (16:55 -0700)

Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp

* commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
Implement issue #3094621 and #3094609 - wipe sd card

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help