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

author	Charles Mendis <cmendis@google.com>
	Fri, 6 Nov 2009 19:46:43 +0000 (11:46 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 6 Nov 2009 19:46:43 +0000 (11:46 -0800)
commit	6b07bf3d8f8f9b5124c19f1206e11634a774c356
tree	1161bd34c59e806ec4412e13c63296e48945aa18	tree \| snapshot
parent	ca3a6dc41418da152d154245c59054f7d0f0d679	commit \| diff
parent	3cba72880b78b81cda2868136462c9e261a3e403	commit \| diff

am 3cba7288: Merge change I6ccd2ebc into eclair

Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
Expose PowerManager.isScreenOn in the public api.

api/current.xml	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/WindowManagerService.java	diff1 \|	diff2 \|	blob \| history

frameworks/base

About OSDN

Find Software

Develop Software

Help

api/current.xml	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/WindowManagerService.java	diff1 \|	diff2 \|	blob \| history