Gloria Wang 27030e51a0 am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h ... * commit '969749319ca17f6e0c6836303a78cc484df2539b': Add heartbeat error codes into MediaErrors.h		2011-04-27 12:24:42 -07:00
cmds
include	resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp	2011-04-12 10:27:15 -07:00
libs	am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"	2011-04-26 11:45:46 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:32:25 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00