Conley Owens 7521344df2 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" ... * commit 'd8b027b18f5a922ef729c6ee363eecb053358d47': stagefright aacenc/amrwbenc: Convert line breaks to Unix style		2011-06-09 12:14:11 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread	2011-05-24 17:29:12 -07:00
libs	am 19974ecc: Fix a leak in RefBase (DO NOT MERGE)	2011-06-08 19:56:06 -07:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread	2011-05-24 17:29:12 -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	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00