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

author	Wink Saville <wink@google.com>
	Fri, 25 Oct 2013 16:54:35 +0000 (09:54 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 25 Oct 2013 16:54:35 +0000 (09:54 -0700)

* commit 'b557b89c4dde4c760b1ce7c6317d3077378692e0':
Display remaining attempts when using or changing SIM PIN

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help