Ken Shirriff 3fef58c952 resolved conflicts for merge of 410ea6 to master		2009-06-08 13:44:17 -07:00
awt
camera/libcameraservice	some work to try to reduce the code size of some native libraries	2009-05-26 16:12:20 -07:00
cmds	get rid of utils.h	2009-05-31 19:13:00 -07:00
im/java/android/im
include	am e3523054: Merge change 3356 into donut	2009-06-05 21:17:31 -07:00
libs	get rid of LogSocket which wasn't even implemented (enabled)	2009-06-05 15:11:23 -07:00
opengl	am cede1ed3: fix [1610840] Positional light doesn\'t work correctly on emulator	2009-06-03 15:12:30 -07:00
tts	Updating TtsEngine.h and SynthProxy.cpp so that buffer memory	2009-06-05 13:58:33 -07:00
MODULE_LICENSE_APACHE2
NOTICE