TK MUN ee6229ad0c am ce475995: (-s ours) am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support ... * commit 'ce475995740942d75eda7af820072c765256ec73': DO NOT MERGE WiMAX support		2011-03-09 23:03:16 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am e6f0ae12: am efd3266b: Input improvements and bug fixes.	2011-03-09 18:39:46 -08:00
libs	Input improvements and bug fixes.	2011-03-09 18:30:28 -08:00
opengl	Merge "Added screenshot after glDraw* option to GLES2 Debugger"	2011-03-09 10:05:38 -08:00
services/surfaceflinger	ANativeWindow: add queues-to-window-composer check.	2011-03-08 16:49:51 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00