Ying Wang add3c2277c resolved conflicts for merge of 2f6f6240 to master ... Change-Id: Ia91944b5c28a04b6b3f968305266a39a376a0e85		2010-06-15 15:58:28 -07:00
awt	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08:00
camera	Change camera interface to support multiple cameras.	2010-06-11 16:47:33 +08:00
cmds	keystore: rephrase the comment to make the usage more clear.	2010-03-17 16:31:20 +08:00
include	am 34b418cd: am 5e95930b: am 43a9527c: Fix include paths.	2010-06-13 20:03:20 -07:00
libs	am e0e5da0d: am 96e59eb8: Merge "Support for multiple tests" into gingerbread	2010-06-14 17:06:56 -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