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

author	Maurice Lam <yukl@google.com>
	Tue, 20 Jan 2015 21:49:49 +0000 (21:49 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 20 Jan 2015 21:49:49 +0000 (21:49 +0000)

* commit '1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8':
[WifiSetup] Don't pan the window for IME

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help