James Dong 6b2cec0158 am 865448a0: Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1 ... * commit '865448a04f4921877d652c3018ef65bada312084': Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode		2011-03-04 11:39:15 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Wake screen from external HID peripherals.	2011-03-02 19:57:07 -08:00
libs	Wake screen from external HID peripherals.	2011-03-02 19:57:07 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	remove some logs	2011-03-02 18:45:50 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00