Dianne Hackborn 5a7753f91b resolved conflicts for merge of 2ecce34f to master ... Change-Id: Ic4e38199beaf8c16f9d28ac5296e8aaa61788b36		2010-03-12 16:46:46 -08: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	Merge "keystore: add AID_ROOT into the user table."	2010-03-08 17:50:56 -08:00
common	Add a voice search hint context for the launcher.	2010-03-11 10:14:16 -08:00
include	implement connect/disconnect in our native_window_t implementations	2010-03-11 15:06:54 -08:00
libs	implement connect/disconnect in our native_window_t implementations	2010-03-11 15:06:54 -08:00
opengl	Add correct copyright headers to multiple files	2010-03-11 18:22:10 -08: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