git.osdn.net Git - android-x86/frameworks-base.git/commitdiff

author	Tadashi G. Takaoka <takaoka@google.com>
	Thu, 20 Jan 2011 15:41:12 +0000 (07:41 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 20 Jan 2011 15:41:12 +0000 (07:41 -0800)

* commit 'b1ba4367b6ef046ec137345932318265f210a205':
Add android.provider.Settings.EXTRA_INPUT_METHOD_ID

		1	2
api/current.xml	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

frameworks/base

About OSDN

Find Software

Develop Software

Help