Gilles Debunne 89fae4a43f am 8f8aac5e: Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb ... * commit '8f8aac5e8adfe14b8a01d90424b1815e0a0ebe28': Pixel were missing on the last line of text when using MaxLines.		2011-01-31 18:52:38 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb	2011-01-30 15:03:03 -08:00
libs	am 1314bdb2: am e88fa50b: Merge from open-source gingerbread	2011-01-30 16:32:44 -08:00
opengl	Fix a multithreading bug in libagl's EGL.	2011-01-30 15:59:36 -08:00
services/surfaceflinger	Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb	2011-01-30 15:00:44 -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