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

author	Lucky Zhang <luckyzh@google.com>
	Tue, 9 Dec 2014 23:15:37 +0000 (23:15 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 9 Dec 2014 23:15:37 +0000 (23:15 +0000)

automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
[FRP] Screen Lock for Setup Wizard shows wrong title

		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help