Justin Ho 3399c2aa5c am 0a909a12: Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb ... * commit '0a909a12a853f9755da031e8a39b10ca6cc1e9ac': Updated notification and effects for Honeycomb Bug: 3389139		2011-01-31 23:18:46 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00