James Dong b53b7358c3 Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1		2011-03-04 11:37:07 -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	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -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 adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00