John Wang 06b25c197b am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo ... Merge commit 'f77fff4b4e904486bf25affde713294d40764e15' into kraken * commit 'f77fff4b4e904486bf25affde713294d40764e15': Add ILLEGAL_SIM_OR_ME error code.		2010-04-21 14:51:43 -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	am f021d12f: merge from open-source master	2010-04-21 09:15:15 -07:00
libs	DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16	2010-04-20 21:55:40 -07:00
opengl	small cleanup. gEGLImpl should have been static	2010-04-09 14:26:07 -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