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

author	Hung-ying Tyan <tyanh@google.com>
	Mon, 3 Aug 2009 08:37:54 +0000 (01:37 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 3 Aug 2009 08:37:54 +0000 (01:37 -0700)

Merge commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e'

* commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e':
Add VPN connection lost dialog.

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help