Brad Fitzpatrick 8ccce0fdbc am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread ... Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp * commit '59993d9bc589089e6be55371c6536a42afe21a64': Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX		2010-10-19 12:44:19 -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 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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00