Jean-Baptiste Queru afddd2a070 am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs" ... * commit '27badee3f567015183ab584fae1cbd32a996e78d': stubs		2011-01-31 14:00:52 -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