Brad Fitzpatrick e84e02ec59 am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp ... Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d' * commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d': Fix a race between requesting/loading/writing SharedPreferences.		2010-09-07 22:10:41 -07:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread	2010-09-07 18:52:06 -07:00
libs	am 2a08e2a9: am a19ef306: Revert "Free created FileMap when uncompressing files"	2010-09-07 19:41:00 -07:00
opengl	Add KHR_gl_texture_2D_image extension string.	2010-08-27 16:08:03 -07:00
services/surfaceflinger	am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread	2010-08-25 16:40:28 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00