Scott Main 4e79c39153 am 9a8df805: am 1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread ... * commit '9a8df8054b2e38a27d8e8e6b17365979218f0e3f': docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs		2010-10-29 10:26:24 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	resolved conflicts for merge of df3cccf3 to master	2010-10-27 22:18:43 -07:00
libs	resolved conflicts for merge of df3cccf3 to master	2010-10-27 22:18:43 -07:00
opengl	Merge "OpenGL ES 1 YUV texturing test"	2010-10-28 15:44:11 -07:00
services/surfaceflinger	am 5c0efef9: am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:48:26 -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	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00