Jean-Baptiste Queru e2fa4bc12c resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp ... Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d		2010-10-20 18:16:57 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix bug where home presses were not poking user activity.	2010-10-18 14:50:13 -07:00
libs	Reduce logging.	2010-10-19 15:08:05 -04:00
opengl	am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread	2010-10-19 18:26:28 -07:00
services/surfaceflinger	am 04358138: Merge "[3095807] screen takes a long time to turn on" into gingerbread	2010-10-14 16:51:05 -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