Robert Greenwalt 339b90e023 resolved conflicts for merge of 4e33e9c1 to master ... Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b		2010-04-08 13:54: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	Add test annotations to frameworks common tests.	2010-04-02 08:53:22 -07:00
include	merge from open-source master	2010-04-08 11:27:55 -07:00
libs	Make pixels prettier.	2010-04-05 18:12:27 -07:00
opengl	am 4790259c: am 8de2cf4c: merge from open-source master	2010-03-31 14:23:19 -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