Nick Kralevich 7984c8c7ab am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch ... Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken * commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c': do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch		2010-06-10 11:54:53 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Remove the lock/unlock workaround from CameraService	2010-06-09 21:30:43 -07: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	allow re-targetting of surfaces	2010-06-08 20:10:02 -07:00
libs	allow re-targetting of surfaces	2010-06-08 20:10:02 -07:00
opengl	update EGL headers to the latest	2010-06-09 18:56:05 -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	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00