Xia Wang 57628043d4 am 05ab5caa: am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 ... * commit '05ab5caa80fdea6bba8ec2fa758be8e9c7ad4b3d': Add WifiStressTest to Wi-Fi only test suite.		2011-03-10 16:01:45 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00