Gloria Wang 172abbb311 resolved conflicts for merge of 9084631d to gingerbread-plus-aosp ... Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472		2010-10-25 16:11:18 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Add unit tests for native input and fix bugs identified.	2010-10-23 03:52:57 -07:00
libs	Add unit tests for native input and fix bugs identified.	2010-10-23 03:52:57 -07:00
opengl	am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread	2010-10-21 17:07:15 -07:00
services/surfaceflinger	am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread	2010-10-20 21:28:25 -07: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