Scott Main 1c63d5fb71 am 71786ceb: am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo ... Merge commit '71786ceb8ce91d209b974f899e7f9c66f57afacd' into kraken * commit '71786ceb8ce91d209b974f899e7f9c66f57afacd': cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54		2010-04-16 16:21:58 -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	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
NOTICE