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

author	Mathias Agopian <mathias@google.com>
	Wed, 18 Aug 2010 23:34:40 +0000 (16:34 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 18 Aug 2010 23:34:40 +0000 (16:34 -0700)

Merge commit '17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp

* commit '17da06631041f9f2237738fb673a74a85b1d9cf4':
fix [2931161] crash in labyritnth when completing a level

		1	2
opengl/libagl/egl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

frameworks/native

About OSDN

Find Software

Develop Software

Help