Adam Powell 4ad6092674 resolved conflicts for merge of 81cd2e90 to master ... Fixed public.xml value padding for kraken/master Merge commit '81cd2e90' into manualmerge Conflicts: api/current.xml Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71		2010-04-23 16:49:54 -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	better fix for [2420565] Surface.lockCanvas() updates the dirty region too often	2010-04-21 22:25:35 -07:00
libs	more surfaceflinger cleanups	2010-04-21 22:28:20 -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