Joe Malin 851bdd74d1 am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread ... Merge commit '75d3591b2dd60e50182542045147b9b6033c2b85' into gingerbread-plus-aosp * commit '75d3591b2dd60e50182542045147b9b6033c2b85': DOC CHANGE: Fix bug in Testing doc		2010-10-14 12:09:33 -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 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread	2010-10-13 15:59:42 -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
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00