Shimeng (Simon) Wang 8043106caf am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread ... Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp * commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6': Don't force ended when full screen video is returned manually.		2010-10-18 17:04:47 -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	Fix bug where home presses were not poking user activity.	2010-10-18 14:50:13 -07:00
opengl	am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread	2010-09-23 18:17:08 -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