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

author	Alan Viverette <alanv@google.com>
	Thu, 13 Mar 2014 10:01:42 +0000 (10:01 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 13 Mar 2014 10:01:42 +0000 (10:01 +0000)

* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
DO NOT MERGE Remove extra fragment in captioning preferences

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

Simple merge

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help