Huahui Wu 9ff302118c am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1 ... * commit '37c2e3e55641e91dd0ec3dbd296bc6bc7c7641cf': b/4075349 Make the pinch to zoom more responsive after limits.		2011-03-09 15:39:56 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
libs	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -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
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