Jim Miller c13aae1e42 am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo ... Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken * commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31': Fix 2325549: Allow up to 4 lines of summary text in Settings		2010-04-05 17:25:17 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Still do dump() if we cannot get mServiceLock for a while.	2010-03-05 15:21:02 -08:00
cmds	keystore: rephrase the comment to make the usage more clear.	2010-03-17 16:31:20 +08:00
common	Add test annotations to frameworks common tests.	2010-04-02 08:53:22 -07:00
include	fix [2545826] calling into gralloc with external lock held	2010-03-25 14:34:49 -07:00
libs	Fix isssue 2548710: Native AudioTrack resources never freed.	2010-03-31 12:36:34 -07:00
opengl	merge from open-source master	2010-03-31 14:01:45 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Start using CLDR for some date-and-time strings and formats.	2009-05-15 10:15:50 -07:00