Scott Main 72e0d14e01 resolved conflicts for merge of 45703007 to master ... Change-Id: Ib340803fe7ff4bea79d873a5f58ca3202889c7d3		2010-04-16 17:20:05 -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	Move the public method HttpDateTime.parse() into AndroidHttpClient.	2010-04-09 13:34:15 -07:00
include	when a zero dimension buffer is allocated, turn the allocation into	2010-04-15 15:23:25 -07:00
libs	when a zero dimension buffer is allocated, turn the allocation into	2010-04-15 15:23:25 -07:00
opengl	am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken	2010-04-10 11:43:17 -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	Start using CLDR for some date-and-time strings and formats.	2009-05-15 10:15:50 -07:00