Nick Pelly f0732fbd4d am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread ... * commit 'd64d711d457326b503981f7e55ab1448fa23ad9f': Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)		2011-01-10 12:06:39 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread	2010-12-07 14:22:56 -08:00
libs	am bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"	2010-12-28 11:39:21 -08:00
opengl	am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread	2010-12-08 16:20:23 -08:00
services/surfaceflinger	am c724f2fb: disable the bypass mode. DO NOT MERGE.	2010-12-20 11:30:23 -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