Roy West 7f82f9bb3c am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread ... Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp * commit '29f28cdc5315d11919595bf8623d6a67797a34e7': Change storage names to match 10-13 decision		2010-10-14 12:03:19 -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 "OBB: use PBKDF2 for key generation." into gingerbread	2010-10-13 18:29:43 -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