Jeff Hamilton afc443efc0 am 737fe548: (-s ours) am ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb ... * commit '737fe5480f3e5029c298eb3b4c8efb870484cefd': Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE		2011-01-31 11:07:50 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb	2011-01-30 15:05:42 -08:00
libs	am 1314bdb2: am e88fa50b: Merge from open-source gingerbread	2011-01-30 16:32:44 -08:00
opengl	egl: clear error on function entry	2011-01-25 15:36:21 -08:00
services/surfaceflinger	am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb	2011-01-30 15:05:42 -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