Nick Kralevich 168a7eca42 am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch ... Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp * commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c': do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch		2010-06-10 11:50:51 -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	Bug 2680071: Rename the Cloud to Device	2010-05-12 16:16:34 -07:00
include	am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo	2010-05-06 17:33:45 -07:00
libs	merge from open-source master	2010-05-14 15:04:52 -07:00
opengl	merge from open-source master	2010-05-12 11:58:14 -07:00
vpn	DO NOT MERGE	2010-03-29 18:12:24 -07: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