Mathias Agopian a310993c83 am b0e020ab: Merge "may fix 3097381 and 3097482. don\'t abort on/off if the animation fails" into gingerbread ... Merge commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf' into gingerbread-plus-aosp * commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf': may fix 3097381 and 3097482. don't abort on/off if the animation fails		2010-10-14 13:41:28 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "OBB: use PBKDF2 for key generation." into gingerbread	2010-10-13 18:29:43 -07:00
libs	Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread	2010-10-14 11:52:58 -07:00
opengl	am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread	2010-09-23 18:17:08 -07:00
services/surfaceflinger	am b0e020ab: Merge "may fix 3097381 and 3097482. don\'t abort on/off if the animation fails" into gingerbread	2010-10-14 13:41:28 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00