Gloria Wang 9873cdfdbc am 3c1c3d89: (-s ours) am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1 ... * commit '3c1c3d898ca1ade5f8ef0f71ddb928af3a780276': Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.		2011-03-24 12:17:12 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	retire android_native_window_t	2011-03-23 16:43:20 -07:00
libs	Include strings.h for the strcasecmp prototype.	2011-03-21 20:26:25 -07:00
opengl	Check for initialized EGLDisplay when required by specification	2011-03-23 15:59:00 -07:00
services/surfaceflinger	am bd340c7b: am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:38:37 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00