Yu Shan Emily Lau 6d73dc1850 am 5460bb3e: am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 ... * commit '5460bb3e09766d45105dfb05f54f97da1dbc57a3': Add the mem logging into test utility. Bug# 4108259		2011-03-22 11:42:26 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Refactor how timeouts are calculated."	2011-03-17 20:16:42 -07:00
libs	Merge "Refactor how timeouts are calculated."	2011-03-17 20:16:42 -07:00
opengl	Merge "GLES2Debugger: Make command exchange async to improve performance."	2011-03-17 14:38:37 -07:00
services/surfaceflinger	am bd340c7b: am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:38:37 -07: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