Eric Fischer 3873d6e2cd Merge changes I40bfa0f8,I9fe6a999 ... * changes: Restore deleted string still referenced from AndroidManifest. Import revised translations.		2010-11-10 10:26:08 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	The CHEEK_TOUCH stuff never worked. Remove it.	2010-11-08 13:02:58 -08:00
libs	Merge "fix [3148312] Region can access data out of bounds" into gingerbread	2010-11-08 13:40:40 -08:00
opengl	am b02ca27f: am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread	2010-11-09 16:42:27 -08:00
services/surfaceflinger	am 5c0efef9: am 7d452f69: Merge "really fix [3118445] Transform * Transform does not work as expected" into gingerbread	2010-10-27 23:48:26 -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