Dianne Hackborn cb60907a5a resolved conflicts for merge of 6550076f to master		2009-08-12 21:32:10 -07:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Fix issue 1795088 Improve audio routing code	2009-07-23 06:03:39 -07:00
cmds	Fix network order for marshalling in keystore interface.	2009-08-10 16:13:00 +08:00
im/java/android/im
include	am b8546001: Merge change 20878 into donut	2009-08-12 12:36:12 -07:00
libs	am b8546001: Merge change 20878 into donut	2009-08-12 12:36:12 -07:00
opengl	second take, hopefully this time it doesn't break one of the builds: "SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything."	2009-08-11 23:32:29 -07:00
vpn/java/android/net/vpn	Issue an error when VPN connection is lost.	2009-08-03 16:22:24 +08:00
MODULE_LICENSE_APACHE2
NOTICE