Jeff Hamilton 37a1c3a873 am adb8c2f9: Merge "resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp" into honeycomb-plus-aosp ... * commit 'adb8c2f970fb9436fa2b7f515e51efcc878ce4e6': Fix the build, proper current.xml.		2011-01-25 16:34:29 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb	2011-01-24 13:30:37 -08:00
libs	Revert "libutils: Fix race condition in Thread::requestExitAndWait()"	2011-01-25 09:41:20 -08:00
opengl	egl: fix GetProcAddress for EGLimage extensions	2011-01-16 18:12:04 -08:00
services/surfaceflinger	tone down the log spew regarding taking screenshots.	2011-01-24 18:13:54 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00