Scott Main 0f77061f38 am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 ... Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp * commit 'b3a5b85a612703e54e631ffab5bb518eba909899': docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38		2010-10-04 15:49:07 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "ZipFileRO: moar logging and wrap close" into gingerbread	2010-10-04 07:28:20 -07:00
libs	Merge "ZipFileRO: moar logging and wrap close" into gingerbread	2010-10-04 07:28:20 -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 beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread	2010-09-24 18:07:41 -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