Jean-Baptiste Queru d6d2886f08 am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp ... Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342' * commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342': Make disabled TextViews uneditable		2010-10-21 13:47:42 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Revert "Add length-equality test in String operator== checks."	2010-10-20 17:06:28 -07:00
libs	resolved conflicts for merge of 368fdba4 to master	2010-10-21 07:39:10 -07:00
opengl	am add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread	2010-10-21 10:47:32 -07:00
services/surfaceflinger	am 9f6d18ca: am 04358138: Merge "[3095807] screen takes a long time to turn on" into gingerbread	2010-10-16 08:58:35 -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	Add missing NOTICE entries.	2010-10-19 16:56:02 -07:00