Brad Fitzpatrick 69a0299713 resolved conflicts for merge of f37cbe6b to master ... Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05		2010-06-10 15:58:22 -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	am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo	2010-05-12 19:12:53 -07:00
include	am 34e5d967: am 55f8209d: Merge "allow re-targetting of surfaces" into kraken	2010-06-08 20:18:05 -07:00
libs	Add invariant check for stylesString size	2010-06-08 20:50:37 -07:00
opengl	am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken	2010-06-09 19:57:01 -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