Nick Pelly 83f1f8ce07 Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread		2011-01-04 18:31:19 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	[3171580] Add transform field to native buffers. (DO NOT MERGE)	2010-12-03 17:35:07 -08:00
libs	Fix policy issues when screen is off. (DO NOT MERGE)	2010-12-22 16:00:21 -08:00
opengl	fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo	2010-12-08 15:34:02 -08:00
services/surfaceflinger	disable the bypass mode. DO NOT MERGE.	2010-12-18 03:45:26 -08:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00