Conley Owens 4b1d4a7ac3 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" ... * commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2': stagefright aacenc/amrwbenc: Remove trailing whitespace		2011-07-18 12:42:42 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am f458d5fd: Merge "Tweak for forward-compatibility"	2011-06-24 11:28:30 -07:00
libs	am e3b05d09: Merge "Tweaks for forward-compatibility"	2011-06-20 09:05:07 -07:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-15 14:13:04 -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