Romain Guy 2feec33de8 am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE ... Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp * commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e': Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE		2010-02-17 21:17:48 -08:00
awt	Removed system/framework/android.awt.jar.	2009-07-02 14:11:33 -05:00
camera/libcameraservice	Fix issue 2192673: Music Pausing Even when notifications are set to silent.	2009-11-27 05:07:55 -08:00
cmds	keystore: remove old implementation and test.	2009-09-24 13:35:26 +08:00
include	fix some aspects of [2258746] native crash in launcher2	2009-11-13 15:26:29 -08:00
libs	Fix failure to open AVRCP input device due to EPERM.	2010-01-20 19:56:24 -08:00
opengl	am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair	2010-01-09 21:54:28 -08:00
vpn/java/android/net/vpn	Remove deprecated VpnType.getDescription().	2009-09-30 18:39:48 +08:00
MODULE_LICENSE_APACHE2
NOTICE	Start using CLDR for some date-and-time strings and formats.	2009-05-15 10:15:50 -07:00