Jim Miller 56eba87a32 am 5fe24ec7: am 8daefb9c: Fix layout issue on table when device thinks there\'s a SIM. ... * commit '5fe24ec77d183774dfb06262b80b32be608480c7': Fix layout issue on table when device thinks there's a SIM.		2011-06-10 17:43:37 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2	2011-06-09 16:06:07 -07:00
libs	am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2	2011-06-09 16:06:07 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)	2011-06-07 15:02:53 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00